6.8.3-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 139/399 kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
[ Upstream commit 75b5ab134bb5f657ef7979a59106dce0657e8d87 ]
Clang enables -Wenum-enum-conversion and -Wenum-compare-conditional under -Wenum-conversion. A recent change in Clang strengthened these warnings and they appear frequently in common builds, primarily due to several instances in common headers but there are quite a few drivers that have individual instances as well.
include/linux/vmstat.h:508:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
508 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
509 | item];
| ~~~~ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c:955:24: warning: conditional expression between different enumeration types ('enum iwl_mac_beacon_flags' and 'enum iwl_mac_beacon_flags_v1') [-Wenum-compare-conditional]
955 | flags |= is_new_rate ? IWL_MAC_BEACON_CCK
| ^ ~~~~~~~~~~~~~~~~~~
956 | : IWL_MAC_BEACON_CCK_V1;
| ~~~~~~~~~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c:1120:21: warning: conditional expression between different enumeration types ('enum iwl_mac_beacon_flags' and 'enum iwl_mac_beacon_flags_v1') [-Wenum-compare-conditional]
1120 | 0) > 10 ?
| ^
1121 | IWL_MAC_BEACON_FILS :
| ~~~~~~~~~~~~~~~~~~~
1122 | IWL_MAC_BEACON_FILS_V1;
| ~~~~~~~~~~~~~~~~~~~~~~Doing arithmetic between or returning two different types of enums could be a bug, so each of the instance of the warning needs to be evaluated. Unfortunately, as mentioned above, there are many instances of this warning in many different configurations, which can break the build when CONFIG_WERROR is enabled.
To avoid introducing new instances of the warnings while cleaning up the disruption for the majority of users, disable these warnings for the default build while leaving them on for W=1 builds.
--- scripts/Makefile.extrawarn | 2 ++ 1 file changed, 2 insertions(+)
scripts/Makefile.extrawarn +2 -0
@@ -132,6 +132,8 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access) KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict) +KBUILD_CFLAGS += -Wno-enum-compare-conditional +KBUILD_CFLAGS += -Wno-enum-enum-conversion endif endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 140/399 PCI: qcom: Enable BDF to SID translation properly
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit bf79e33cdd89db498e00a6131e937259de5f2705 ]
Qcom SoCs making use of ARM SMMU require BDF to SID translation table in the driver to properly map the SID for the PCIe devices based on their BDF identifier. This is currently achieved with the help of qcom_pcie_config_sid_1_9_0() function for SoCs supporting the 1_9_0 config.
But With newer Qcom SoCs starting from SM8450, BDF to SID translation is set to bypass mode by default in hardware. Due to this, the translation table that is set in the qcom_pcie_config_sid_1_9_0() is essentially unused and the default SID is used for all endpoints in SoCs starting from SM8450.
This is a security concern and also warrants swapping the DeviceID in DT while using the GIC ITS to handle MSIs from endpoints. The swapping is currently done like below in DT when using GIC ITS:
/*
* MSIs for BDF (1:0.0) only works with Device ID 0x5980.
* Hence, the IDs are swapped.
*/
msi-map = <0x0 &gic_its 0x5981 0x1>,
<0x100 &gic_its 0x5980 0x1>;Here, swapping of the DeviceIDs ensure that the endpoint with BDF (1:0.0) gets the DeviceID 0x5980 which is associated with the default SID as per the iommu mapping in DT. So MSIs were delivered with IDs swapped so far. But this also means the Root Port (0:0.0) won't receive any MSIs (for PME, AER etc...)
So let's fix these issues by clearing the BDF to SID bypass mode for all SoCs making use of the 1_9_0 config. This allows the PCIe devices to use the correct SID, thus avoiding the DeviceID swapping hack in DT and also achieving the isolation between devices.
--- drivers/pci/controller/dwc/pcie-qcom.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pci/controller/dwc/pcie-qcom.c +10 -0
@@ -53,6 +53,7 @@#define PARF_SLV_ADDR_SPACE_SIZE 0x358#define PARF_DEVICE_TYPE 0x1000#define PARF_BDF_TO_SID_TABLE_N 0x2000 +#define PARF_BDF_TO_SID_CFG 0x2c00/* ELBI registers */ #define ELBI_SYS_CTRL 0x04
@@ -120,6 +121,9 @@/* PARF_DEVICE_TYPE register fields */ #define DEVICE_TYPE_RC 0x4 +/* PARF_BDF_TO_SID_CFG fields */ +#define BDF_TO_SID_BYPASS BIT(0) +/* ELBI_SYS_CTRL register fields */ #define ELBI_SYS_CTRL_LT_ENABLE BIT(0)
@@ -1030,11 +1034,17 @@ static int qcom_pcie_config_sid_1_9_0(struct qcom_pcie *pcie)u8 qcom_pcie_crc8_table[CRC8_TABLE_SIZE ];int i, nr_map, size =0 ;u32 smmu_sid_base; +u32 val;of_get_property (dev->of_node,"iommu-map" , &size);if (!size)return 0 ; +/* Enable BDF to SID translation by disabling bypass mode (default) */ + val =readl (pcie->parf +PARF_BDF_TO_SID_CFG ); + val &= ~BDF_TO_SID_BYPASS ; +writel (val, pcie->parf +PARF_BDF_TO_SID_CFG ); + map =kzalloc (size,GFP_KERNEL );if (!map)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 141/399 PCI: dwc: endpoint: Fix advertised resizable BAR size
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit 72e34b8593e08a0ee759b7a038e0b178418ea6f8 ]
The commit message in commit fc9a77040b04 ("PCI: designware-ep: Configure Resizable BAR cap to advertise the smallest size") claims that it modifies the Resizable BAR capability to only advertise support for 1 MB size BARs.
However, the commit writes all zeroes to PCI_REBAR_CAP (the register which contains the possible BAR sizes that a BAR be resized to).
According to the spec, it is illegal to not have a bit set in PCI_REBAR_CAP, and 1 MB is the smallest size allowed.
Set bit 4 in PCI_REBAR_CAP, so that we actually advertise support for a 1 MB BAR size.
Before:
Capabilities: [2e8 v1] Physical Resizable BAR
BAR 0: current size: 1MB
BAR 1: current size: 1MB
BAR 2: current size: 1MB
BAR 3: current size: 1MB
BAR 4: current size: 1MB
BAR 5: current size: 1MB
After:
Capabilities: [2e8 v1] Physical Resizable BAR
BAR 0: current size: 1MB, supported: 1MB BAR 1: current size: 1MB, supported: 1MB BAR 2: current size: 1MB, supported: 1MB BAR 3: current size: 1MB, supported: 1MB BAR 4: current size: 1MB, supported: 1MB BAR 5: current size: 1MB, supported: 1MB
--- drivers/pci/controller/dwc/pcie-designware-ep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +6 -1
@@ -629,8 +629,13 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep) nbars = (reg &PCI_REBAR_CTRL_NBAR_MASK ) >>PCI_REBAR_CTRL_NBAR_SHIFT ; +/* +* PCIe r6.0, sec 7.8.6.2 require us to support at least one +* size in the range from 1 MB to 512 GB. Advertise support +* for 1 MB BAR size only. +*/ for (i =0 ; i < nbars; i++, offset +=PCI_REBAR_CTRL ) -dw_pcie_writel_dbi (pci, offset +PCI_REBAR_CAP ,0x0 ); +dw_pcie_writel_dbi (pci, offset +PCI_REBAR_CAP ,BIT (4 )); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 142/399 PCI: hv: Fix ring buffer size calculation
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Kelley <[email protected]>
[ Upstream commit b5ff74c1ef50fe08e384026875fec660fadfaedd ]
For a physical PCI device that is passed through to a Hyper-V guest VM, current code specifies the VMBus ring buffer size as 4 pages. But this is an inappropriate dependency, since the amount of ring buffer space needed is unrelated to PAGE_SIZE. For example, on x86 the ring buffer size ends up as 16 Kbytes, while on ARM64 with 64 Kbyte pages, the ring size bloats to 256 Kbytes. The ring buffer for PCI pass-thru devices is used for only a few messages during device setup and removal, so any space above a few Kbytes is wasted.
Fix this by declaring the ring buffer size to be a fixed 16 Kbytes. Furthermore, use the VMBUS_RING_SIZE() macro so that the ring buffer header is properly accounted for, and so the size is rounded up to a page boundary, using the page size for which the kernel is built. While w/64 Kbyte pages this results in a 64 Kbyte ring buffer header plus a 64 Kbyte ring buffer, that's the smallest possible with that page size. It's still 128 Kbytes better than the current code.
--- drivers/pci/controller/pci-hyperv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-hyperv.c +2 -1
@@ -49,6 +49,7 @@#include <linux/refcount.h> #include <linux/irqdomain.h> #include <linux/acpi.h> +#include <linux/sizes.h> #include <asm/mshyperv.h> /*
@@ -465,7 +466,7 @@ struct pci_eject_response {u32 status; } __packed; -static int pci_ring_size = (4 *PAGE_SIZE ); +static int pci_ring_size =VMBUS_RING_SIZE (SZ_16K );/* * Driver specific state.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 143/399 cifs: prevent updating file size from server if we have a read/write lease
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bharath SM <[email protected]>
[ Upstream commit e4b61f3b1c67f5068590965f64ea6e8d5d5bd961 ]
In cases of large directories, the readdir operation may span multiple round trips to retrieve contents. This introduces a potential race condition in case of concurrent write and readdir operations. If the readdir operation initiates before a write has been processed by the server, it may update the file size attribute to an older value. Address this issue by avoiding file size updates from readdir when we have read/write lease.
Scenario:
1) process1: open dir xyz
2) process1: readdir instance 1 on xyz
3) process2: create file.txt for write
4) process2: write x bytes to file.txt
5) process2: close file.txt
6) process2: open file.txt for read
7) process1: readdir 2 - overwrites file.txt inode size to 0
8) process2: read contents of file.txt - bug, short read with 0 bytes
--- fs/smb/client/cifsproto.h | 6 ++++-- fs/smb/client/file.c | 8 +++++--- fs/smb/client/inode.c | 13 +++++++------ fs/smb/client/readdir.c | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-)
fs/smb/client/cifsproto.h +4 -2
@@ -144,7 +144,8 @@ extern int cifs_reconnect(struct TCP_Server_Info *server,extern int checkSMB (char *buf,unsigned int len,struct TCP_Server_Info *srvr);extern bool is_valid_oplock_break (char *,struct TCP_Server_Info *);extern bool backup_cred (struct cifs_sb_info *); -extern bool is_size_safe_to_change (struct cifsInodeInfo *,__u64 eof); +extern bool is_size_safe_to_change (struct cifsInodeInfo *cifsInode,__u64 eof, +bool from_readdir);extern void cifs_update_eof (struct cifsInodeInfo *cifsi,loff_t offset,unsigned int bytes_written);extern struct cifsFileInfo *find_writable_file (struct cifsInodeInfo *,int );
@@ -201,7 +202,8 @@ extern void cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, struct cifs_sb_info *cifs_sb);extern void cifs_dir_info_to_fattr (struct cifs_fattr *,FILE_DIRECTORY_INFO *,struct cifs_sb_info *); -extern int cifs_fattr_to_inode (struct inode *inode,struct cifs_fattr *fattr); +extern int cifs_fattr_to_inode (struct inode *inode,struct cifs_fattr *fattr, +bool from_readdir);extern struct inode *cifs_iget (struct super_block *sb,struct cifs_fattr *fattr);
fs/smb/client/file.c +5 -3
@@ -329,7 +329,7 @@ int cifs_posix_open(const char *full_path, struct inode **pinode, } }else {cifs_revalidate_mapping (*pinode); - rc =cifs_fattr_to_inode (*pinode, &fattr); + rc =cifs_fattr_to_inode (*pinode, &fattr, false); } posix_open_ret:
@@ -4769,12 +4769,14 @@ static int is_inode_writable(struct cifsInodeInfo *cifs_inode)refreshing the inode only on increases in the file size but this is tricky to do without racing with writebehind page caching in the current Linux kernel design */ -bool is_size_safe_to_change (struct cifsInodeInfo *cifsInode,__u64 end_of_file) +bool is_size_safe_to_change (struct cifsInodeInfo *cifsInode,__u64 end_of_file, +bool from_readdir) {if (!cifsInode)return true; -if (is_inode_writable (cifsInode)) { +if (is_inode_writable (cifsInode) || + ((cifsInode->oplock &CIFS_CACHE_RW_FLG ) !=0 && from_readdir)) {/* This inode is open for write at least once */ struct cifs_sb_info *cifs_sb;
fs/smb/client/inode.c +7 -6
@@ -147,7 +147,8 @@ cifs_nlink_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)/* populate an inode with info from a cifs_fattr struct */ int -cifs_fattr_to_inode (struct inode *inode,struct cifs_fattr *fattr) +cifs_fattr_to_inode (struct inode *inode,struct cifs_fattr *fattr, +bool from_readdir) {struct cifsInodeInfo *cifs_i =CIFS_I (inode);struct cifs_sb_info *cifs_sb =CIFS_SB (inode->i_sb);
@@ -199,7 +200,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)* Can't safely change the file size here if the client is writing to * it due to potential races. */ -if (is_size_safe_to_change (cifs_i, fattr->cf_eof)) { +if (is_size_safe_to_change (cifs_i, fattr->cf_eof, from_readdir)) {i_size_write (inode, fattr->cf_eof);/*
@@ -368,7 +369,7 @@ static int update_inode_info(struct super_block *sb,CIFS_I (*inode)->time =0 ;/* force reval */ return -ESTALE ; } -return cifs_fattr_to_inode (*inode, fattr); +return cifs_fattr_to_inode (*inode, fattr, false); }#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
@@ -403,7 +404,7 @@ cifs_get_file_info_unix(struct file *filp) }else goto cifs_gfiunix_out; - rc =cifs_fattr_to_inode (inode, &fattr); + rc =cifs_fattr_to_inode (inode, &fattr, false); cifs_gfiunix_out:free_xid (xid);
@@ -934,7 +935,7 @@ cifs_get_file_info(struct file *filp) fattr.cf_uniqueid =CIFS_I (inode)->uniqueid; fattr.cf_flags |=CIFS_FATTR_NEED_REVAL ;/* if filetype is different, return error */ - rc =cifs_fattr_to_inode (inode, &fattr); + rc =cifs_fattr_to_inode (inode, &fattr, false); cgfi_exit:cifs_free_open_info (&data);free_xid (xid);
@@ -1491,7 +1492,7 @@ cifs_iget(struct super_block *sb, struct cifs_fattr *fattr) }/* can't fail - see cifs_find_inode() */ -cifs_fattr_to_inode (inode, fattr); +cifs_fattr_to_inode (inode, fattr, false);if (sb->s_flags &SB_NOATIME ) inode->i_flags |=S_NOATIME |S_NOCMTIME ;if (inode->i_state &I_NEW ) {
fs/smb/client/readdir.c +1 -1
@@ -148,7 +148,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name, rc = -ESTALE ; } } -if (!rc && !cifs_fattr_to_inode (inode, fattr)) { +if (!rc && !cifs_fattr_to_inode (inode, fattr, true)) {dput (dentry);return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 144/399 cifs: allow changing password during remount
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
[ Upstream commit c1eb537bf4560b3ad4df606c266c665624f3b502 ]
There are cases where a session is disconnected and password has changed on the server (or expired) for this user and this currently can not be fixed without unmount and mounting again. This patch allows remount to change the password (for the non Kerberos case, Kerberos ticket refresh is handled differently) when the session is disconnected and the user can not reconnect due to still using old password.
Future patches should also allow us to setup the keyring (cifscreds) to have an "alternate password" so we would be able to change the password before the session drops (without the risk of races between when the password changes and the disconnect occurs - ie cases where the old password is still needed because the new password has not fully rolled out to all servers yet).
--- fs/smb/client/cifs_debug.c | 2 ++ fs/smb/client/cifsglob.h | 1 + fs/smb/client/fs_context.c | 27 ++++++++++++++++++++++----- fs/smb/client/smb2pdu.c | 5 +++++ 4 files changed, 30 insertions(+), 5 deletions(-)
fs/smb/client/cifs_debug.c +2 -0
@@ -488,6 +488,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) ses->ses_count, ses->serverOS, ses->serverNOS, ses->capabilities, ses->ses_status); } +if (ses->expired_pwd) +seq_puts (m,"password no longer valid " );spin_unlock (&ses->ses_lock); seq_printf(m, "\n\tSecurity type: %s ",
fs/smb/client/cifsglob.h +1 -0
@@ -1066,6 +1066,7 @@ struct cifs_ses {enum securityEnum sectype;/* what security flavor was specified? */ bool sign;/* is signing required? */ bool domainAuto:1; +bool expired_pwd;/* track if access denied or expired pwd so can know if need to update */ unsigned int flags;__u16 session_flags;__u8 smb3signingkey[SMB3_SIGN_KEY_SIZE ];
fs/smb/client/fs_context.c +22 -5
@@ -772,7 +772,7 @@ static void smb3_fs_context_free(struct fs_context *fc)*/ static int smb3_verify_reconfigure_ctx (struct fs_context *fc,struct smb3_fs_context *new_ctx, -struct smb3_fs_context *old_ctx) +struct smb3_fs_context *old_ctx,bool need_recon) {if (new_ctx->posix_paths != old_ctx->posix_paths) {cifs_errorf (fc,"can not change posixpaths during remount\n" );
@@ -798,8 +798,15 @@ static int smb3_verify_reconfigure_ctx(struct fs_context *fc, }if (new_ctx->password && (!old_ctx->password ||strcmp (new_ctx->password, old_ctx->password))) { -cifs_errorf (fc,"can not change password during remount\n" ); -return -EINVAL ; +if (need_recon == false) { +cifs_errorf (fc, +"can not change password of active session during remount\n" ); +return -EINVAL ; + }else if (old_ctx->sectype == Kerberos) { +cifs_errorf (fc, +"can not change password for Kerberos via remount\n" ); +return -EINVAL ; + } }if (new_ctx->domainname && (!old_ctx->domainname ||strcmp (new_ctx->domainname, old_ctx->domainname))) {
@@ -843,9 +850,14 @@ static int smb3_reconfigure(struct fs_context *fc)struct smb3_fs_context *ctx =smb3_fc2context (fc);struct dentry *root = fc->root;struct cifs_sb_info *cifs_sb =CIFS_SB (root->d_sb); +struct cifs_ses *ses =cifs_sb_master_tcon (cifs_sb)->ses; +bool need_recon = false;int rc; - rc =smb3_verify_reconfigure_ctx (fc, ctx, cifs_sb->ctx); +if (ses->expired_pwd) + need_recon = true; + + rc =smb3_verify_reconfigure_ctx (fc, ctx, cifs_sb->ctx, need_recon);if (rc)return rc;
@@ -858,7 +870,12 @@ static int smb3_reconfigure(struct fs_context *fc)STEAL_STRING (cifs_sb, ctx,UNC );STEAL_STRING (cifs_sb, ctx, source);STEAL_STRING (cifs_sb, ctx, username); -STEAL_STRING_SENSITIVE (cifs_sb, ctx, password); +if (need_recon == false) +STEAL_STRING_SENSITIVE (cifs_sb, ctx, password); +else { +kfree_sensitive (ses->password); + ses->password =kstrdup (ctx->password,GFP_KERNEL ); + }STEAL_STRING (cifs_sb, ctx, domainname);STEAL_STRING (cifs_sb, ctx, nodename);STEAL_STRING (cifs_sb, ctx, iocharset);
fs/smb/client/smb2pdu.c +5 -0
@@ -1536,6 +1536,11 @@ SMB2_sess_sendreceive(struct SMB2_sess_data *sess_data) &sess_data->buf0_type, CIFS_LOG_ERROR | CIFS_SESS_OP, &rsp_iov);cifs_small_buf_release (sess_data->iov[0 ].iov_base); +if (rc ==0 ) + sess_data->ses->expired_pwd = false; +else if ((rc == -EACCES ) || (rc == -EKEYEXPIRED ) || (rc == -EKEYREVOKED )) + sess_data->ses->expired_pwd = true; +memcpy (&sess_data->iov[0 ], &rsp_iov,sizeof (struct kvec ));return rc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 145/399 thermal/drivers/mediatek: Fix control buffer enablement on MT7896
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Wunderlich <[email protected]>
[ Upstream commit 371ed6263e2403068b359f0c07188548c2d70827 ]
Reading thermal sensor on mt7986 devices returns invalid temperature:
bpi-r3 ~ # cat /sys/class/thermal/thermal_zone0/temp
-274000
Fix this by adding missing members in mtk_thermal_data struct which were used in mtk_thermal_turn_on_buffer after commit 33140e668b10.
--- drivers/thermal/mediatek/auxadc_thermal.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/thermal/mediatek/auxadc_thermal.c +3 -0
@@ -690,6 +690,9 @@ static const struct mtk_thermal_data mt7986_thermal_data = { .adcpnp = mt7986_adcpnp, .sensor_mux_values = mt7986_mux_values, .version = MTK_THERMAL_V3, + .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1, + .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3), + .apmixed_buffer_ctl_set = BIT(0), };static bool mtk_thermal_temp_is_valid (int temp)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 146/399 vfio/pci: Disable auto-enable of exclusive INTx IRQ
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit fe9a7082684eb059b925c535682e68c34d487d43 ]
Currently for devices requiring masking at the irqchip for INTx, ie. devices without DisINTx support, the IRQ is enabled in request_irq() and subsequently disabled as necessary to align with the masked status flag. This presents a window where the interrupt could fire between these events, resulting in the IRQ incrementing the disable depth twice. This would be unrecoverable for a user since the masked flag prevents nested enables through vfio.
Instead, invert the logic using IRQF_NO_AUTOEN such that exclusive INTx is never auto-enabled, then unmask as required.
--- drivers/vfio/pci/vfio_pci_intrs.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +10 -7
@@ -296,8 +296,15 @@ static int vfio_intx_set_signal(struct vfio_pci_core_device *vdev, int fd) ctx->trigger = trigger; +/* +* Devices without DisINTx support require an exclusive interrupt, +* IRQ masking is performed at the IRQ chip. The masked status is +* protected by vdev->irqlock. Setup the IRQ without auto-enable and +* unmask as necessary below under lock. DisINTx is unmodified by +* the IRQ configuration and may therefore use auto-enable. +*/ if (!vdev->pci_2_3) - irqflags =0 ; + irqflags =IRQF_NO_AUTOEN ; ret =request_irq (pdev->irq, vfio_intx_handler, irqflags, ctx->name, vdev);
@@ -308,13 +315,9 @@ static int vfio_intx_set_signal(struct vfio_pci_core_device *vdev, int fd)return ret; } -/* -* INTx disable will stick across the new irq setup, -* disable_irq won't. -*/ spin_lock_irqsave (&vdev->irqlock, flags); -if (!vdev->pci_2_3 && ctx->masked) -disable_irq_nosync (pdev->irq); +if (!vdev->pci_2_3 && !ctx->masked) +enable_irq (pdev->irq);spin_unlock_irqrestore (&vdev->irqlock, flags);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 147/399 vfio/pci: Lock external INTx masking ops
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit 810cd4bb53456d0503cc4e7934e063835152c1b7 ]
Mask operations through config space changes to DisINTx may race INTx configuration changes via ioctl. Create wrappers that add locking for paths outside of the core interrupt code.
In particular, irq_type is updated holding igate, therefore testing is_intx() requires holding igate. For example clearing DisINTx from config space can otherwise race changes of the interrupt configuration.
This aligns interfaces which may trigger the INTx eventfd into two camps, one side serialized by igate and the other only enabled while INTx is configured. A subsequent patch introduces synchronization for the latter flows.
--- drivers/vfio/pci/vfio_pci_intrs.c | 34 +++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +28 -6
@@ -99,13 +99,15 @@ static void vfio_send_intx_eventfd(void *opaque, void *unused) }/* Returns true if the INTx vfio_pci_irq_ctx.masked value is changed. */ -bool vfio_pci_intx_mask (struct vfio_pci_core_device *vdev) +static bool __vfio_pci_intx_mask (struct vfio_pci_core_device *vdev) {struct pci_dev *pdev = vdev->pdev;struct vfio_pci_irq_ctx *ctx;unsigned long flags;bool masked_changed = false; +lockdep_assert_held (&vdev->igate); +spin_lock_irqsave (&vdev->irqlock, flags);/*
@@ -143,6 +145,17 @@ bool vfio_pci_intx_mask(struct vfio_pci_core_device *vdev)return masked_changed; } +bool vfio_pci_intx_mask (struct vfio_pci_core_device *vdev) +{ +bool mask_changed; + +mutex_lock (&vdev->igate); + mask_changed =__vfio_pci_intx_mask (vdev); +mutex_unlock (&vdev->igate); + +return mask_changed; +} +/* * If this is triggered by an eventfd, we can't call eventfd_signal * or else we'll deadlock on the eventfd wait queue. Return >0 when
@@ -194,12 +207,21 @@ static int vfio_pci_intx_unmask_handler(void *opaque, void *unused)return ret; } -void vfio_pci_intx_unmask (struct vfio_pci_core_device *vdev) +static void __vfio_pci_intx_unmask (struct vfio_pci_core_device *vdev) { +lockdep_assert_held (&vdev->igate); +if (vfio_pci_intx_unmask_handler (vdev,NULL ) >0 )vfio_send_intx_eventfd (vdev,NULL ); } +void vfio_pci_intx_unmask (struct vfio_pci_core_device *vdev) +{ +mutex_lock (&vdev->igate); +__vfio_pci_intx_unmask (vdev); +mutex_unlock (&vdev->igate); +} +static irqreturn_t vfio_intx_handler (int irq,void *dev_id) {struct vfio_pci_core_device *vdev = dev_id;
@@ -563,11 +585,11 @@ static int vfio_pci_set_intx_unmask(struct vfio_pci_core_device *vdev,return -EINVAL ;if (flags &VFIO_IRQ_SET_DATA_NONE ) { -vfio_pci_intx_unmask (vdev); +__vfio_pci_intx_unmask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) {uint8_t unmask = *(uint8_t *)data;if (unmask) -vfio_pci_intx_unmask (vdev); +__vfio_pci_intx_unmask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) {struct vfio_pci_irq_ctx *ctx =vfio_irq_ctx_get (vdev,0 );int32_t fd = *(int32_t *)data;
@@ -594,11 +616,11 @@ static int vfio_pci_set_intx_mask(struct vfio_pci_core_device *vdev,return -EINVAL ;if (flags &VFIO_IRQ_SET_DATA_NONE ) { -vfio_pci_intx_mask (vdev); +__vfio_pci_intx_mask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) {uint8_t mask = *(uint8_t *)data;if (mask) -vfio_pci_intx_mask (vdev); +__vfio_pci_intx_mask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) {return -ENOTTY ;/* XXX implement me */ }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 148/399 vfio/platform: Disable virqfds on cleanup
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit fcdc0d3d40bc26c105acf8467f7d9018970944ae ]
irqfds for mask and unmask that are not specifically disabled by the user are leaked. Remove any irqfds during cleanup
--- drivers/vfio/platform/vfio_platform_irq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/vfio/platform/vfio_platform_irq.c +4 -1
@@ -321,8 +321,11 @@ void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev) {int i; -for (i =0 ; i < vdev->num_irqs; i++) +for (i =0 ; i < vdev->num_irqs; i++) { +vfio_virqfd_disable (&vdev->irqs[i].mask); +vfio_virqfd_disable (&vdev->irqs[i].unmask);vfio_set_trigger (vdev, i,-1 ,NULL ); + } vdev->num_irqs =0 ;kfree (vdev->irqs);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 149/399 vfio/platform: Create persistent IRQ handlers
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit 675daf435e9f8e5a5eab140a9864dfad6668b375 ]
The vfio-platform SET_IRQS ioctl currently allows loopback triggering of an interrupt before a signaling eventfd has been configured by the user, which thereby allows a NULL pointer dereference.
Rather than register the IRQ relative to a valid trigger, register all IRQs in a disabled state in the device open path. This allows mask operations on the IRQ to nest within the overall enable state governed by a valid eventfd signal. This decouples @masked, protected by the @locked spinlock from @trigger, protected via the @igate mutex.
In doing so, it's guaranteed that changes to @trigger cannot race the IRQ handlers because the IRQ handler is synchronously disabled before modifying the trigger, and loopback triggering of the IRQ via ioctl is safe due to serialization with trigger changes via igate.
For compatibility, request_irq() failures are maintained to be local to the SET_IRQS ioctl rather than a fatal error in the open device path. This allows, for example, a userspace driver with polling mode support to continue to work regardless of moving the request_irq() call site. This necessarily blocks all SET_IRQS access to the failed index.
--- drivers/vfio/platform/vfio_platform_irq.c | 100 +++++++++++++++------- 1 file changed, 68 insertions(+), 32 deletions(-)
drivers/vfio/platform/vfio_platform_irq.c +68 -32
@@ -136,6 +136,16 @@ static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,return 0 ; } +/* +* The trigger eventfd is guaranteed valid in the interrupt path +* and protected by the igate mutex when triggered via ioctl. +*/ +static void vfio_send_eventfd (struct vfio_platform_irq *irq_ctx) +{ +if (likely (irq_ctx->trigger)) +eventfd_signal (irq_ctx->trigger); +} +static irqreturn_t vfio_automasked_irq_handler (int irq,void *dev_id) {struct vfio_platform_irq *irq_ctx = dev_id;
@@ -155,7 +165,7 @@ static irqreturn_t vfio_automasked_irq_handler(int irq, void *dev_id)spin_unlock_irqrestore (&irq_ctx->lock, flags);if (ret ==IRQ_HANDLED ) -eventfd_signal (irq_ctx->trigger); +vfio_send_eventfd (irq_ctx);return ret; }
@@ -164,52 +174,40 @@ static irqreturn_t vfio_irq_handler(int irq, void *dev_id) {struct vfio_platform_irq *irq_ctx = dev_id; -eventfd_signal (irq_ctx->trigger); +vfio_send_eventfd (irq_ctx);return IRQ_HANDLED ; }static int vfio_set_trigger (struct vfio_platform_device *vdev,int index, -int fd,irq_handler_t handler) +int fd) {struct vfio_platform_irq *irq = &vdev->irqs[index];struct eventfd_ctx *trigger; -int ret;if (irq->trigger) { -irq_clear_status_flags (irq->hwirq,IRQ_NOAUTOEN ); -free_irq (irq->hwirq, irq); -kfree (irq->name); +disable_irq (irq->hwirq);eventfd_ctx_put (irq->trigger); irq->trigger =NULL ; }if (fd <0 )/* Disable only */ return 0 ; - irq->name =kasprintf (GFP_KERNEL_ACCOUNT ,"vfio-irq[%d](%s)" , - irq->hwirq, vdev->name); -if (!irq->name) -return -ENOMEM ; trigger =eventfd_ctx_fdget (fd); -if (IS_ERR (trigger)) { -kfree (irq->name); +if (IS_ERR (trigger))return PTR_ERR (trigger); - } irq->trigger = trigger; -irq_set_status_flags (irq->hwirq,IRQ_NOAUTOEN ); - ret =request_irq (irq->hwirq, handler,0 , irq->name, irq); -if (ret) { -kfree (irq->name); -eventfd_ctx_put (trigger); - irq->trigger =NULL ; -return ret; - } - -if (!irq->masked) -enable_irq (irq->hwirq); +/* +* irq->masked effectively provides nested disables within the overall +* enable relative to trigger. Specifically request_irq() is called +* with NO_AUTOEN, therefore the IRQ is initially disabled. The user +* may only further disable the IRQ with a MASK operations because +* irq->masked is initially false. +*/ +enable_irq (irq->hwirq);return 0 ; }
@@ -228,7 +226,7 @@ static int vfio_platform_set_irq_trigger(struct vfio_platform_device *vdev, handler = vfio_irq_handler;if (!count && (flags &VFIO_IRQ_SET_DATA_NONE )) -return vfio_set_trigger (vdev, index,-1 , handler); +return vfio_set_trigger (vdev, index,-1 );if (start !=0 || count !=1 )return -EINVAL ;
@@ -236,7 +234,7 @@ static int vfio_platform_set_irq_trigger(struct vfio_platform_device *vdev,if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) {int32_t fd = *(int32_t *)data; -return vfio_set_trigger (vdev, index, fd, handler); +return vfio_set_trigger (vdev, index, fd); }if (flags &VFIO_IRQ_SET_DATA_NONE ) {
@@ -260,6 +258,14 @@ int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev, unsigned start, unsigned count, uint32_t flags, void *data) = NULL; +/* +* For compatibility, errors from request_irq() are local to the +* SET_IRQS path and reflected in the name pointer. This allows, +* for example, polling mode fallback for an exclusive IRQ failure. +*/ +if (IS_ERR (vdev->irqs[index].name)) +return PTR_ERR (vdev->irqs[index].name); +switch (flags &VFIO_IRQ_SET_ACTION_TYPE_MASK ) {case VFIO_IRQ_SET_ACTION_MASK : func = vfio_platform_set_irq_mask;
@@ -280,7 +286,7 @@ int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev,int vfio_platform_irq_init (struct vfio_platform_device *vdev) { -int cnt =0 , i; +int cnt =0 , i, ret =0 ;while (vdev->get_irq (vdev, cnt) >=0 ) cnt++;
@@ -292,29 +298,54 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev)for (i =0 ; i < cnt; i++) {int hwirq = vdev->get_irq (vdev, i); +irq_handler_t handler = vfio_irq_handler; -if (hwirq <0 ) +if (hwirq <0 ) { + ret = -EINVAL ; goto err; + }spin_lock_init (&vdev->irqs[i].lock); vdev->irqs[i].flags =VFIO_IRQ_INFO_EVENTFD ; -if (irq_get_trigger_type (hwirq) &IRQ_TYPE_LEVEL_MASK ) +if (irq_get_trigger_type (hwirq) &IRQ_TYPE_LEVEL_MASK ) { vdev->irqs[i].flags |=VFIO_IRQ_INFO_MASKABLE |VFIO_IRQ_INFO_AUTOMASKED ; + handler = vfio_automasked_irq_handler; + } vdev->irqs[i].count =1 ; vdev->irqs[i].hwirq = hwirq; vdev->irqs[i].masked = false; + vdev->irqs[i].name =kasprintf (GFP_KERNEL_ACCOUNT , +"vfio-irq[%d](%s)" , hwirq, + vdev->name); +if (!vdev->irqs[i].name) { + ret = -ENOMEM ; + goto err; + } + + ret =request_irq (hwirq, handler,IRQF_NO_AUTOEN , + vdev->irqs[i].name, &vdev->irqs[i]); +if (ret) { +kfree (vdev->irqs[i].name); + vdev->irqs[i].name =ERR_PTR (ret); + } } vdev->num_irqs = cnt;return 0 ; err: +for (--i; i >=0 ; i--) { +if (!IS_ERR (vdev->irqs[i].name)) { +free_irq (vdev->irqs[i].hwirq, &vdev->irqs[i]); +kfree (vdev->irqs[i].name); + } + }kfree (vdev->irqs); -return -EINVAL ; +return ret; }void vfio_platform_irq_cleanup (struct vfio_platform_device *vdev)
@@ -324,7 +355,12 @@ void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev)for (i =0 ; i < vdev->num_irqs; i++) {vfio_virqfd_disable (&vdev->irqs[i].mask);vfio_virqfd_disable (&vdev->irqs[i].unmask); -vfio_set_trigger (vdev, i,-1 ,NULL ); +if (!IS_ERR (vdev->irqs[i].name)) { +free_irq (vdev->irqs[i].hwirq, &vdev->irqs[i]); +if (vdev->irqs[i].trigger) +eventfd_ctx_put (vdev->irqs[i].trigger); +kfree (vdev->irqs[i].name); + } } vdev->num_irqs =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 150/399 vfio/fsl-mc: Block calling interrupt handler without trigger
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit 7447d911af699a15f8d050dfcb7c680a86f87012 ]
The eventfd_ctx trigger pointer of the vfio_fsl_mc_irq object is initially NULL and may become NULL if the user sets the trigger eventfd to -1. The interrupt handler itself is guaranteed that trigger is always valid between request_irq() and free_irq(), but the loopback testing mechanisms to invoke the handler function need to test the trigger. The triggering and setting ioctl paths both make use of igate and are therefore mutually exclusive.
The vfio-fsl-mc driver does not make use of irqfds, nor does it support any sort of masking operations, therefore unlike vfio-pci and vfio-platform, the flow can remain essentially unchanged.
--- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c +4 -3
@@ -141,13 +141,14 @@ static int vfio_fsl_mc_set_irq_trigger(struct vfio_fsl_mc_device *vdev, irq = &vdev->mc_irqs[index];if (flags &VFIO_IRQ_SET_DATA_NONE ) { -vfio_fsl_mc_irq_handler (hwirq, irq); +if (irq->trigger) +eventfd_signal (irq->trigger); }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) {u8 trigger = *(u8 *)data; -if (trigger) -vfio_fsl_mc_irq_handler (hwirq, irq); +if (trigger && irq->trigger) +eventfd_signal (irq->trigger); }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 151/399 tpm,tpm_tis: Avoid warning splat at shutdown
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
[ Upstream commit b7ab4bbd0188f3985b821fa09456b11105a8dedf ]
If interrupts are not activated the work struct 'free_irq_work' is not initialized. This results in a warning splat at module shutdown.
Fix this by always initializing the work regardless of whether interrupts are activated or not.
--- drivers/char/tpm/tpm_tis_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/char/tpm/tpm_tis_core.c +1 -2
@@ -919,8 +919,6 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask,int rc;u32 int_status; -INIT_WORK (&priv->free_irq_work, tpm_tis_free_irq_func); - rc =devm_request_threaded_irq (chip->dev.parent, irq,NULL , tis_int_handler,IRQF_ONESHOT | flags,dev_name (&chip->dev), chip);
@@ -1132,6 +1130,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, priv->phy_ops = phy_ops; priv->locality_count =0 ;mutex_init (&priv->locality_count_mutex); +INIT_WORK (&priv->free_irq_work, tpm_tis_free_irq_func);dev_set_drvdata (&chip->dev, priv);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 152/399 ksmbd: replace generic_fillattr with vfs_getattr
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marios Makassikis <[email protected]>
[ Upstream commit 5614c8c487f6af627614dd2efca038e4afe0c6d7 ]
generic_fillattr should not be used outside of ->getattr implementations.
Use vfs_getattr instead, and adapt functions to return an error code to the caller.
--- fs/smb/server/smb2pdu.c | 170 ++++++++++++++++++++++++------------- fs/smb/server/smb_common.c | 11 ++- fs/smb/server/vfs.c | 12 ++- 3 files changed, 127 insertions(+), 66 deletions(-)
fs/smb/server/smb2pdu.c +110 -60
@@ -3828,11 +3828,16 @@ static int process_query_dir_entries(struct smb2_query_dir_private *priv) } ksmbd_kstat.kstat = &kstat; -if (priv->info_level !=FILE_NAMES_INFORMATION ) -ksmbd_vfs_fill_dentry_attrs (priv->work, - idmap, - dent, - &ksmbd_kstat); +if (priv->info_level !=FILE_NAMES_INFORMATION ) { + rc =ksmbd_vfs_fill_dentry_attrs (priv->work, + idmap, + dent, + &ksmbd_kstat); +if (rc) { +dput (dent); +continue ; + } + } rc = smb2_populate_readdir_entry(priv->work->conn, priv->info_level,
@@ -4480,6 +4485,7 @@ static int get_file_basic_info(struct smb2_query_info_rsp *rsp,struct smb2_file_basic_info *basic_info;struct kstat stat;u64 time; +int ret;if (!(fp->daccess &FILE_READ_ATTRIBUTES_LE )) { pr_err("no right to read the attributes : 0x%x\n",
@@ -4487,9 +4493,12 @@ static int get_file_basic_info(struct smb2_query_info_rsp *rsp,return -EACCES ; } + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret; + basic_info = (struct smb2_file_basic_info *)rsp->Buffer; -generic_fillattr (file_mnt_idmap (fp->filp),STATX_BASIC_STATS , -file_inode (fp->filp), &stat); basic_info->CreationTime =cpu_to_le64 (fp->create_time); time =ksmbd_UnixTimeToNT (stat.atime); basic_info->LastAccessTime =cpu_to_le64 (time);
@@ -4504,27 +4513,31 @@ static int get_file_basic_info(struct smb2_query_info_rsp *rsp,return 0 ; } -static void get_file_standard_info (struct smb2_query_info_rsp *rsp, -struct ksmbd_file *fp,void *rsp_org) +static int get_file_standard_info (struct smb2_query_info_rsp *rsp, +struct ksmbd_file *fp,void *rsp_org) {struct smb2_file_standard_info *sinfo;unsigned int delete_pending; -struct inode *inode;struct kstat stat; +int ret; - inode =file_inode (fp->filp); -generic_fillattr (file_mnt_idmap (fp->filp),STATX_BASIC_STATS , inode, &stat); + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret; sinfo = (struct smb2_file_standard_info *)rsp->Buffer; delete_pending =ksmbd_inode_pending_delete (fp); - sinfo->AllocationSize =cpu_to_le64 (inode->i_blocks <<9 ); + sinfo->AllocationSize =cpu_to_le64 (stat.blocks <<9 ); sinfo->EndOfFile =S_ISDIR (stat.mode) ?0 :cpu_to_le64 (stat.size); sinfo->NumberOfLinks =cpu_to_le32 (get_nlink (&stat) - delete_pending); sinfo->DeletePending = delete_pending; sinfo->Directory =S_ISDIR (stat.mode) ?1 :0 ; rsp->OutputBufferLength =cpu_to_le32 (sizeof (struct smb2_file_standard_info )); + +return 0 ; } static void get_file_alignment_info(struct smb2_query_info_rsp *rsp,
@@ -4546,11 +4559,11 @@ static int get_file_all_info(struct ksmbd_work *work,struct ksmbd_conn *conn = work->conn;struct smb2_file_all_info *file_info;unsigned int delete_pending; -struct inode *inode;struct kstat stat;int conv_len;char *filename;u64 time; +int ret;if (!(fp->daccess &FILE_READ_ATTRIBUTES_LE )) { ksmbd_debug(SMB, "no right to read the attributes : 0x%x\n",
@@ -4562,8 +4575,10 @@ static int get_file_all_info(struct ksmbd_work *work,if (IS_ERR (filename))return PTR_ERR (filename); - inode =file_inode (fp->filp); -generic_fillattr (file_mnt_idmap (fp->filp),STATX_BASIC_STATS , inode, &stat); + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret;ksmbd_debug (SMB ,"filename = %s\n" , filename); delete_pending =ksmbd_inode_pending_delete (fp);
@@ -4579,7 +4594,7 @@ static int get_file_all_info(struct ksmbd_work *work, file_info->Attributes = fp->f_ci->m_fattr; file_info->Pad1 =0 ; file_info->AllocationSize = -cpu_to_le64 (inode->i_blocks <<9 ); +cpu_to_le64 (stat.blocks <<9 ); file_info->EndOfFile =S_ISDIR (stat.mode) ?0 :cpu_to_le64 (stat.size); file_info->NumberOfLinks =cpu_to_le32 (get_nlink (&stat) - delete_pending);
@@ -4623,10 +4638,10 @@ static void get_file_alternate_info(struct ksmbd_work *work,cpu_to_le32 (sizeof (struct smb2_file_alt_name_info ) + conv_len); } -static void get_file_stream_info (struct ksmbd_work *work, -struct smb2_query_info_rsp *rsp, -struct ksmbd_file *fp, -void *rsp_org) +static int get_file_stream_info (struct ksmbd_work *work, +struct smb2_query_info_rsp *rsp, +struct ksmbd_file *fp, +void *rsp_org) {struct ksmbd_conn *conn = work->conn;struct smb2_file_stream_info *file_info;
@@ -4637,9 +4652,13 @@ static void get_file_stream_info(struct ksmbd_work *work,int nbytes =0 , streamlen, stream_name_len, next, idx =0 ;int buf_free_len;struct smb2_query_info_req *req =ksmbd_req_buf_next (work); +int ret; + + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret; -generic_fillattr (file_mnt_idmap (fp->filp),STATX_BASIC_STATS , -file_inode (fp->filp), &stat); file_info = (struct smb2_file_stream_info *)rsp->Buffer; buf_free_len =
@@ -4720,29 +4739,37 @@ static void get_file_stream_info(struct ksmbd_work *work,kvfree (xattr_list); rsp->OutputBufferLength =cpu_to_le32 (nbytes); + +return 0 ; } -static void get_file_internal_info (struct smb2_query_info_rsp *rsp, -struct ksmbd_file *fp,void *rsp_org) +static int get_file_internal_info (struct smb2_query_info_rsp *rsp, +struct ksmbd_file *fp,void *rsp_org) {struct smb2_file_internal_info *file_info;struct kstat stat; +int ret; + + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret; -generic_fillattr (file_mnt_idmap (fp->filp),STATX_BASIC_STATS , -file_inode (fp->filp), &stat); file_info = (struct smb2_file_internal_info *)rsp->Buffer; file_info->IndexNumber =cpu_to_le64 (stat.ino); rsp->OutputBufferLength =cpu_to_le32 (sizeof (struct smb2_file_internal_info )); + +return 0 ; }static int get_file_network_open_info (struct smb2_query_info_rsp *rsp,struct ksmbd_file *fp,void *rsp_org) {struct smb2_file_ntwrk_info *file_info; -struct inode *inode;struct kstat stat;u64 time; +int ret;if (!(fp->daccess &FILE_READ_ATTRIBUTES_LE )) { pr_err("no right to read the attributes : 0x%x\n",
@@ -4750,10 +4777,12 @@ static int get_file_network_open_info(struct smb2_query_info_rsp *rsp,return -EACCES ; } - file_info = (struct smb2_file_ntwrk_info *)rsp->Buffer; + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret; - inode =file_inode (fp->filp); -generic_fillattr (file_mnt_idmap (fp->filp),STATX_BASIC_STATS , inode, &stat); + file_info = (struct smb2_file_ntwrk_info *)rsp->Buffer; file_info->CreationTime =cpu_to_le64 (fp->create_time); time =ksmbd_UnixTimeToNT (stat.atime);
@@ -4763,8 +4792,7 @@ static int get_file_network_open_info(struct smb2_query_info_rsp *rsp, time =ksmbd_UnixTimeToNT (stat.ctime); file_info->ChangeTime =cpu_to_le64 (time); file_info->Attributes = fp->f_ci->m_fattr; - file_info->AllocationSize = -cpu_to_le64 (inode->i_blocks <<9 ); + file_info->AllocationSize =cpu_to_le64 (stat.blocks <<9 ); file_info->EndOfFile =S_ISDIR (stat.mode) ?0 :cpu_to_le64 (stat.size); file_info->Reserved =cpu_to_le32 (0 ); rsp->OutputBufferLength =
@@ -4804,14 +4832,17 @@ static void get_file_mode_info(struct smb2_query_info_rsp *rsp,cpu_to_le32 (sizeof (struct smb2_file_mode_info )); } -static void get_file_compression_info (struct smb2_query_info_rsp *rsp, -struct ksmbd_file *fp,void *rsp_org) +static int get_file_compression_info (struct smb2_query_info_rsp *rsp, +struct ksmbd_file *fp,void *rsp_org) {struct smb2_file_comp_info *file_info;struct kstat stat; +int ret; -generic_fillattr (file_mnt_idmap (fp->filp),STATX_BASIC_STATS , -file_inode (fp->filp), &stat); + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret; file_info = (struct smb2_file_comp_info *)rsp->Buffer; file_info->CompressedFileSize =cpu_to_le64 (stat.blocks <<9 );
@@ -4823,6 +4854,8 @@ static void get_file_compression_info(struct smb2_query_info_rsp *rsp, rsp->OutputBufferLength =cpu_to_le32 (sizeof (struct smb2_file_comp_info )); + +return 0 ; } static int get_file_attribute_tag_info(struct smb2_query_info_rsp *rsp,
@@ -4844,7 +4877,7 @@ static int get_file_attribute_tag_info(struct smb2_query_info_rsp *rsp,return 0 ; } -static void find_file_posix_info (struct smb2_query_info_rsp *rsp, +static int find_file_posix_info (struct smb2_query_info_rsp *rsp,struct ksmbd_file *fp,void *rsp_org) {struct smb311_posix_qinfo *file_info;
@@ -4852,24 +4885,31 @@ static void find_file_posix_info(struct smb2_query_info_rsp *rsp,struct mnt_idmap *idmap =file_mnt_idmap (fp->filp);vfsuid_t vfsuid =i_uid_into_vfsuid (idmap, inode);vfsgid_t vfsgid =i_gid_into_vfsgid (idmap, inode); +struct kstat stat;u64 time;int out_buf_len =sizeof (struct smb311_posix_qinfo ) +32 ; +int ret; + + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) +return ret; file_info = (struct smb311_posix_qinfo *)rsp->Buffer; file_info->CreationTime =cpu_to_le64 (fp->create_time); - time =ksmbd_UnixTimeToNT (inode_get_atime (inode)); + time =ksmbd_UnixTimeToNT (stat.atime); file_info->LastAccessTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode_get_mtime (inode)); + time =ksmbd_UnixTimeToNT (stat.mtime); file_info->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); + time =ksmbd_UnixTimeToNT (stat.ctime); file_info->ChangeTime =cpu_to_le64 (time); file_info->DosAttributes = fp->f_ci->m_fattr; - file_info->Inode =cpu_to_le64 (inode->i_ino); - file_info->EndOfFile =cpu_to_le64 (inode->i_size); - file_info->AllocationSize =cpu_to_le64 (inode->i_blocks <<9 ); - file_info->HardLinks =cpu_to_le32 (inode->i_nlink); - file_info->Mode =cpu_to_le32 (inode->i_mode &0777 ); - file_info->DeviceId =cpu_to_le32 (inode->i_rdev); + file_info->Inode =cpu_to_le64 (stat.ino); + file_info->EndOfFile =cpu_to_le64 (stat.size); + file_info->AllocationSize =cpu_to_le64 (stat.blocks <<9 ); + file_info->HardLinks =cpu_to_le32 (stat.nlink); + file_info->Mode =cpu_to_le32 (stat.mode &0777 ); + file_info->DeviceId =cpu_to_le32 (stat.rdev);/* * Sids(32) contain two sids(Domain sid(16), UNIX group sid(16)).
@@ -4882,6 +4922,8 @@ static void find_file_posix_info(struct smb2_query_info_rsp *rsp, SIDUNIX_GROUP, (struct smb_sid *)&file_info->Sids[16]); rsp->OutputBufferLength =cpu_to_le32 (out_buf_len); + +return 0 ; } static int smb2_get_info_file(struct ksmbd_work *work,
@@ -4930,7 +4972,7 @@ static int smb2_get_info_file(struct ksmbd_work *work,break ;case FILE_STANDARD_INFORMATION : -get_file_standard_info (rsp, fp, work->response_buf); + rc =get_file_standard_info (rsp, fp, work->response_buf);break ;case FILE_ALIGNMENT_INFORMATION :
@@ -4946,11 +4988,11 @@ static int smb2_get_info_file(struct ksmbd_work *work,break ;case FILE_STREAM_INFORMATION : -get_file_stream_info (work, rsp, fp, work->response_buf); + rc =get_file_stream_info (work, rsp, fp, work->response_buf);break ;case FILE_INTERNAL_INFORMATION : -get_file_internal_info (rsp, fp, work->response_buf); + rc =get_file_internal_info (rsp, fp, work->response_buf);break ;case FILE_NETWORK_OPEN_INFORMATION :
@@ -4974,7 +5016,7 @@ static int smb2_get_info_file(struct ksmbd_work *work,break ;case FILE_COMPRESSION_INFORMATION : -get_file_compression_info (rsp, fp, work->response_buf); + rc =get_file_compression_info (rsp, fp, work->response_buf);break ;case FILE_ATTRIBUTE_TAG_INFORMATION :
@@ -4985,7 +5027,7 @@ static int smb2_get_info_file(struct ksmbd_work *work,pr_err ("client doesn't negotiate with SMB3.1.1 POSIX Extensions\n" ); rc = -EOPNOTSUPP ; }else { -find_file_posix_info (rsp, fp, work->response_buf); + rc =find_file_posix_info (rsp, fp, work->response_buf); }break ;default :
@@ -5398,7 +5440,6 @@ int smb2_close(struct ksmbd_work *work)struct smb2_close_rsp *rsp;struct ksmbd_conn *conn = work->conn;struct ksmbd_file *fp; -struct inode *inode;u64 time;int err =0 ;
@@ -5453,24 +5494,33 @@ int smb2_close(struct ksmbd_work *work) rsp->Reserved =0 ;if (req->Flags ==SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB ) { +struct kstat stat; +int ret; + fp =ksmbd_lookup_fd_fast (work, volatile_id);if (!fp) { err = -ENOENT ; goto out; } - inode =file_inode (fp->filp); + ret =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (ret) { +ksmbd_fd_put (work, fp); + goto out; + } + rsp->Flags =SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB ; - rsp->AllocationSize =S_ISDIR (inode->i_mode) ?0 : -cpu_to_le64 (inode->i_blocks <<9 ); - rsp->EndOfFile =cpu_to_le64 (inode->i_size); + rsp->AllocationSize =S_ISDIR (stat.mode) ?0 : +cpu_to_le64 (stat.blocks <<9 ); + rsp->EndOfFile =cpu_to_le64 (stat.size); rsp->Attributes = fp->f_ci->m_fattr; rsp->CreationTime =cpu_to_le64 (fp->create_time); - time =ksmbd_UnixTimeToNT (inode_get_atime (inode)); + time =ksmbd_UnixTimeToNT (stat.atime); rsp->LastAccessTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode_get_mtime (inode)); + time =ksmbd_UnixTimeToNT (stat.mtime); rsp->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); + time =ksmbd_UnixTimeToNT (stat.ctime); rsp->ChangeTime =cpu_to_le64 (time);ksmbd_fd_put (work, fp); }else {
fs/smb/server/smb_common.c +7 -4
@@ -457,10 +457,13 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level, } ksmbd_kstat.kstat = &kstat; -ksmbd_vfs_fill_dentry_attrs (work, - idmap, - dentry, - &ksmbd_kstat); + rc =ksmbd_vfs_fill_dentry_attrs (work, + idmap, + dentry, + &ksmbd_kstat); +if (rc) +break ; + rc =fn (conn, info_level, d_info, &ksmbd_kstat);if (rc)break ;
fs/smb/server/vfs.c +10 -2
@@ -1682,11 +1682,19 @@ int ksmbd_vfs_fill_dentry_attrs(struct ksmbd_work *work,struct dentry *dentry, struct ksmbd_kstat *ksmbd_kstat) { + struct ksmbd_share_config *share_conf = work->tcon->share_conf;u64 time;int rc; +struct path path = { + .mnt = share_conf->vfs_path.mnt, + .dentry = dentry, + }; -generic_fillattr (idmap,STATX_BASIC_STATS ,d_inode (dentry), - ksmbd_kstat->kstat); + rc =vfs_getattr (&path, ksmbd_kstat->kstat, +STATX_BASIC_STATS |STATX_BTIME , +AT_STATX_SYNC_AS_STAT ); +if (rc) +return rc; time =ksmbd_UnixTimeToNT (ksmbd_kstat->kstat->ctime); ksmbd_kstat->create_time = time;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 153/399 ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marios Makassikis <[email protected]>
[ Upstream commit 34cd86b6632718b7df3999d96f51e63de41c5e4f ]
Use vfs_getattr() to retrieve stat information, rather than make assumptions about how a filesystem fills inode structs.
--- fs/smb/server/smb2pdu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/smb/server/smb2pdu.c +8 -2
@@ -5809,15 +5809,21 @@ static int set_file_allocation_info(struct ksmbd_work *work,loff_t alloc_blks;struct inode *inode; +struct kstat stat;int rc;if (!(fp->daccess &FILE_WRITE_DATA_LE ))return -EACCES ; + rc =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (rc) +return rc; + alloc_blks = (le64_to_cpu (file_alloc_info->AllocationSize) +511 ) >>9 ; inode =file_inode (fp->filp); -if (alloc_blks > inode->i_blocks) { +if (alloc_blks > stat.blocks) {smb_break_all_levII_oplock (work, fp,1 ); rc =vfs_fallocate (fp->filp,FALLOC_FL_KEEP_SIZE ,0 , alloc_blks *512 );
@@ -5825,7 +5831,7 @@ static int set_file_allocation_info(struct ksmbd_work *work,pr_err ("vfs_fallocate is failed : %d\n" , rc);return rc; } - }else if (alloc_blks < inode->i_blocks) { + }else if (alloc_blks < stat.blocks) {loff_t size;/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 154/399 platform/x86/intel/tpmi: Change vsec offset to u64
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
[ Upstream commit 57221a07ff37ff356f9265acd228bc3c8744c8fc ]
The vsec offset can be 64 bit long depending on the PFS start. So change type to u64. Also use 64 bit formatting for seq_printf.
--- drivers/platform/x86/intel/tpmi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/platform/x86/intel/tpmi.c +5 -4
@@ -96,7 +96,7 @@ struct intel_tpmi_pfs_entry {*/ struct intel_tpmi_pm_feature {struct intel_tpmi_pfs_entry pfs_header; -unsigned int vsec_offset; +u64 vsec_offset;struct intel_vsec_device *vsec_dev; };
@@ -376,7 +376,7 @@ static int tpmi_pfs_dbg_show(struct seq_file *s, void *unused) read_blocked = feature_state.read_blocked ?'Y' :'N' ; write_blocked = feature_state.write_blocked ?'Y' :'N' ; } - seq_printf(s, "0x%02x\t\t0x%02x\t\t0x%04x\t\t0x%04x\t\t0x%02x\t\t0x%08x\t%c\t%c\t\t%c\t\t%c\n", + seq_printf(s, "0x%02x\t\t0x%02x\t\t0x%04x\t\t0x%04x\t\t0x%02x\t\t0x%016llx\t%c\t%c\t\t%c\t\t%c\n", pfs->pfs_header.tpmi_id, pfs->pfs_header.num_entries, pfs->pfs_header.entry_size, pfs->pfs_header.cap_offset, pfs->pfs_header.attribute, pfs->vsec_offset, locked, disabled,
@@ -395,7 +395,8 @@ static int tpmi_mem_dump_show(struct seq_file *s, void *unused)struct intel_tpmi_pm_feature *pfs = s->private;int count, ret =0 ;void __iomem *mem; -u32 off, size; +u32 size; +u64 off;u8 *buffer; size =TPMI_GET_SINGLE_ENTRY_SIZE (pfs);
@@ -411,7 +412,7 @@ static int tpmi_mem_dump_show(struct seq_file *s, void *unused)mutex_lock (&tpmi_dev_lock);for (count =0 ; count < pfs->pfs_header.num_entries; ++count) { -seq_printf (s,"TPMI Instance:%d offset:0x%x\n" , count, off); +seq_printf (s,"TPMI Instance:%d offset:0x%llx\n" , count, off); mem =ioremap (off, size);if (!mem) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 155/399 io_uring/rw: return IOU_ISSUE_SKIP_COMPLETE for multishot retry
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit 0a3737db8479b77f95f4bfda8e71b03c697eb56a ]
If read multishot is being invoked from the poll retry handler, then we should return IOU_ISSUE_SKIP_COMPLETE rather than -EAGAIN. If not, then a CQE will be posted with -EAGAIN rather than triggering the retry when the file is flagged as readable again.
--- io_uring/rw.c | 2 ++ 1 file changed, 2 insertions(+)
io_uring/rw.c +2 -0
@@ -948,6 +948,8 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags)*/ if (io_kbuf_recycle (req, issue_flags)) rw->len =0 ; +if (issue_flags &IO_URING_F_MULTISHOT ) +return IOU_ISSUE_SKIP_COMPLETE ;return -EAGAIN ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 156/399 io_uring: clean rings on NO_MMAP alloc fail
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ Upstream commit cef59d1ea7170ec753182302645a0191c8aa3382 ]
We make a few cancellation judgements based on ctx->rings, so let's zero it afer deallocation for IORING_SETUP_NO_MMAP just like it's done with the mmap case. Likely, it's not a real problem, but zeroing is safer and better tested.
--- io_uring/io_uring.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
io_uring/io_uring.c +3 -2
@@ -2776,14 +2776,15 @@ static void io_rings_free(struct io_ring_ctx *ctx)if (!(ctx->flags &IORING_SETUP_NO_MMAP )) {io_mem_free (ctx->rings);io_mem_free (ctx->sq_sqes); - ctx->rings =NULL ; - ctx->sq_sqes =NULL ; }else {io_pages_free (&ctx->ring_pages, ctx->n_ring_pages); ctx->n_ring_pages =0 ;io_pages_free (&ctx->sqe_pages, ctx->n_sqe_pages); ctx->n_sqe_pages =0 ; } + + ctx->rings =NULL ; + ctx->sq_sqes =NULL ; }void *io_mem_alloc (size_t size)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 157/399 ring-buffer: Do not set shortest_full when full target is hit
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 761d9473e27f0c8782895013a3e7b52a37c8bcfc ]
The rb_watermark_hit() checks if the amount of data in the ring buffer is above the percentage level passed in by the "full" variable. If it is, it returns true.
But it also sets the "shortest_full" field of the cpu_buffer that informs writers that it needs to call the irq_work if the amount of data on the ring buffer is above the requested amount.
The rb_watermark_hit() always sets the shortest_full even if the amount in the ring buffer is what it wants. As it is not going to wait, because it has what it wants, there's no reason to set shortest_full.
--- kernel/trace/ring_buffer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/trace/ring_buffer.c +4 -3
@@ -834,9 +834,10 @@ static bool rb_watermark_hit(struct trace_buffer *buffer, int cpu, int full) pagebusy = cpu_buffer->reader_page == cpu_buffer->commit_page; ret = !pagebusy &&full_hit (buffer, cpu, full); -if (!cpu_buffer->shortest_full || - cpu_buffer->shortest_full > full) - cpu_buffer->shortest_full = full; +if (!ret && (!cpu_buffer->shortest_full || + cpu_buffer->shortest_full > full)) { + cpu_buffer->shortest_full = full; + }raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); }return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 158/399 ring-buffer: Fix full_waiters_pending in poll
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 8145f1c35fa648da662078efab299c4467b85ad5 ]
If a reader of the ring buffer is doing a poll, and waiting for the ring buffer to hit a specific watermark, there could be a case where it gets into an infinite ping-pong loop.
The poll code has:
rbwork->full_waiters_pending = true;
if (!cpu_buffer->shortest_full ||
cpu_buffer->shortest_full > full)
cpu_buffer->shortest_full = full;The writer will see full_waiters_pending and check if the ring buffer is filled over the percentage of the shortest_full value. If it is, it calls an irq_work to wake up all the waiters.
But the code could get into a circular loop:
CPU 0 CPU 1
----- -----
[ Poll ]
[ shortest_full = 0 ]
rbwork->full_waiters_pending = true;
if (rbwork->full_waiters_pending &&
[ buffer percent ] > shortest_full) {
rbwork->wakeup_full = true;
[ queue_irqwork ]cpu_buffer->shortest_full = full;
[ IRQ work ]
if (rbwork->wakeup_full) {
cpu_buffer->shortest_full = 0;
wakeup poll waiters;
[woken]
if ([ buffer percent ] > full)
break;
rbwork->full_waiters_pending = true;
if (rbwork->full_waiters_pending &&
[ buffer percent ] > shortest_full) {
rbwork->wakeup_full = true;
[ queue_irqwork ]cpu_buffer->shortest_full = full;
[ IRQ work ]
if (rbwork->wakeup_full) {
cpu_buffer->shortest_full = 0;
wakeup poll waiters;[woken]
[ Wash, rinse, repeat! ]
In the poll, the shortest_full needs to be set before the full_pending_waiters, as once that is set, the writer will compare the current shortest_full (which is incorrect) to decide to call the irq_work, which will reset the shortest_full (expecting the readers to update it).
Also move the setting of full_waiters_pending after the check if the ring buffer has the required percentage filled. There's no reason to tell the writer to wake up waiters if there are no waiters.
--- kernel/trace/ring_buffer.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
kernel/trace/ring_buffer.c +20 -7
@@ -965,16 +965,32 @@ __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu,poll_wait (filp, &rbwork->full_waiters, poll_table);raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); - rbwork->full_waiters_pending = true;if (!cpu_buffer->shortest_full || cpu_buffer->shortest_full > full) cpu_buffer->shortest_full = full;raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); - }else { -poll_wait (filp, &rbwork->waiters, poll_table); - rbwork->waiters_pending = true; +if (full_hit (buffer, cpu, full)) +return EPOLLIN |EPOLLRDNORM ; +/* +* Only allow full_waiters_pending update to be seen after +* the shortest_full is set. If the writer sees the +* full_waiters_pending flag set, it will compare the +* amount in the ring buffer to shortest_full. If the amount +* in the ring buffer is greater than the shortest_full +* percent, it will call the irq_work handler to wake up +* this list. The irq_handler will reset shortest_full +* back to zero. That's done under the reader_lock, but +* the below smp_mb() makes sure that the update to +* full_waiters_pending doesn't leak up into the above. +*/ +smp_mb (); + rbwork->full_waiters_pending = true; +return 0 ; } +poll_wait (filp, &rbwork->waiters, poll_table); + rbwork->waiters_pending = true; +/* * There's a tight race between setting the waiters_pending and * checking if the ring buffer is empty. Once the waiters_pending bit
@@ -990,9 +1006,6 @@ __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu,*/ smp_mb (); -if (full) -return full_hit (buffer, cpu, full) ?EPOLLIN |EPOLLRDNORM :0 ; -if ((cpu ==RING_BUFFER_ALL_CPUS && !ring_buffer_empty (buffer)) || (cpu !=RING_BUFFER_ALL_CPUS && !ring_buffer_empty_cpu (buffer, cpu)))return EPOLLIN |EPOLLRDNORM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 159/399 ring-buffer: Use wait_event_interruptible() in ring_buffer_wait()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 7af9ded0c2caac0a95f33df5cb04706b0f502588 ]
Convert ring_buffer_wait() over to wait_event_interruptible(). The default condition is to execute the wait loop inside __wait_event() just once.
This does not change the ring_buffer_wait() prototype yet, but restructures the code so that it can take a "cond" and "data" parameter and will call wait_event_interruptible() with a helper function as the condition.
The helper function (rb_wait_cond) takes the cond function and data parameters. It will first check if the buffer hit the watermark defined by the "full" parameter and then call the passed in condition parameter. If either are true, it returns true.
If rb_wait_cond() does not return true, it will set the appropriate "waiters_pending" flag and returns false.
--- include/linux/ring_buffer.h | 1 + kernel/trace/ring_buffer.c | 116 +++++++++++++++++++++--------------- 2 files changed, 69 insertions(+), 48 deletions(-)
include/linux/ring_buffer.h +1 -0
@@ -98,6 +98,7 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k__ring_buffer_alloc ((size), (flags), &__key); \ }) +typedef bool (*ring_buffer_cond_fn )(void *data);int ring_buffer_wait (struct trace_buffer *buffer,int cpu,int full);__poll_t ring_buffer_poll_wait (struct trace_buffer *buffer,int cpu,struct file *filp,poll_table *poll_table,int full);
kernel/trace/ring_buffer.c +68 -48
138 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 160/399 tracing/ring-buffer: Fix wait_on_pipe() race
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 2aa043a55b9a764c9cbde5a8c654eeaaffe224cf ]
When the trace_pipe_raw file is closed, there should be no new readers on the file descriptor. This is mostly handled with the waking and wait_index fields of the iterator. But there's still a slight race.
CPU 0 CPU 1
----- -----
wait_index++;
index = wait_index;
ring_buffer_wake_waiters();
wait_on_pipe()
ring_buffer_wait();The ring_buffer_wait() will miss the wakeup from CPU 1. The problem is that the ring_buffer_wait() needs the logic of:
prepare_to_wait();
if (!condition)
schedule();Where the missing condition check is the iter->wait_index update.
Have the ring_buffer_wait() take a conditional callback function and a data parameter that can be used within the wait_event_interruptible() of the ring_buffer_wait() function.
In wait_on_pipe(), pass a condition function that will check if the wait_index has been updated, if it has, it will return true to break out of the wait_event_interruptible() loop.
Create a new field "closed" in the trace_iterator and set it in the .flush() callback before calling ring_buffer_wake_waiters(). This will keep any new readers from waiting on a closed file descriptor.
Have the wait_on_pipe() condition callback also check the closed field.
Change the wait_index field of the trace_iterator to atomic_t. There's no reason it needs to be 'long' and making it atomic and using atomic_read_acquire() and atomic_fetch_inc_release() will provide the necessary memory barriers.
Add a "woken" flag to tracing_buffers_splice_read() to exit the loop after one more try to fetch data. That is, if it waited for data and something woke it up, it should try to collect any new data and then exit back to user space.
--- include/linux/ring_buffer.h | 3 ++- include/linux/trace_events.h | 5 ++++- kernel/trace/ring_buffer.c | 13 ++++++----- kernel/trace/trace.c | 43 ++++++++++++++++++++++++++---------- 4 files changed, 45 insertions(+), 19 deletions(-)
include/linux/ring_buffer.h +2 -1
@@ -99,7 +99,8 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k })typedef bool (*ring_buffer_cond_fn )(void *data); -int ring_buffer_wait (struct trace_buffer *buffer,int cpu,int full); +int ring_buffer_wait (struct trace_buffer *buffer,int cpu,int full, +ring_buffer_cond_fn cond,void *data);__poll_t ring_buffer_poll_wait (struct trace_buffer *buffer,int cpu,struct file *filp,poll_table *poll_table,int full);void ring_buffer_wake_waiters (struct trace_buffer *buffer,int cpu);
include/linux/trace_events.h +4 -1
@@ -103,13 +103,16 @@ struct trace_iterator {unsigned int temp_size;char *fmt;/* modified format holder */ unsigned int fmt_size; -long wait_index; +atomic_t wait_index;/* trace_seq for __print_flags() and __print_symbolic() etc. */ struct trace_seq tmp_seq;cpumask_var_t started; +/* Set when the file is closed to prevent new waiters */ +bool closed; +/* it's true when current open file is snapshot */ bool snapshot;
kernel/trace/ring_buffer.c +8 -5
@@ -902,23 +902,26 @@ static bool rb_wait_once(void *data)* @buffer: buffer to wait on * @cpu: the cpu buffer to wait on * @full: wait until the percentage of pages are available, if @cpu != RING_BUFFER_ALL_CPUS +* @cond: condition function to break out of wait (NULL to run once) +* @data: the data to pass to @cond. * * If @cpu == RING_BUFFER_ALL_CPUS then the task will wake up as soon * as data is added to any of the @buffer's cpu buffers. Otherwise * it will wait for data to be added to a specific cpu buffer. */ -int ring_buffer_wait (struct trace_buffer *buffer,int cpu,int full) +int ring_buffer_wait (struct trace_buffer *buffer,int cpu,int full, +ring_buffer_cond_fn cond,void *data) {struct ring_buffer_per_cpu *cpu_buffer;struct wait_queue_head *waitq; -ring_buffer_cond_fn cond;struct rb_irq_work *rbwork; -void *data;long once =0 ;int ret =0 ; - cond = rb_wait_once; - data = &once; +if (!cond) { + cond = rb_wait_once; + data = &once; + }/* * Depending on what the caller is waiting for, either any
kernel/trace/trace.c +31 -12
97 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 161/399 dlm: fix user space lkb refcounting
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Aring <[email protected]>
[ Upstream commit 2ab3d705ca5d4f7ea345a21c3da41a447a549649 ]
This patch fixes to check on the right return value if it was the last callback. The rv variable got overwritten by the return of copy_result_to_user(). Fixing it by introducing a second variable for the return value and don't let rv being overwritten.
--- fs/dlm/user.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/dlm/user.c +5 -5
@@ -806,7 +806,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,struct dlm_lkb *lkb;DECLARE_WAITQUEUE (wait, current);struct dlm_callback *cb; -int rv, copy_lvb =0 ; +int rv, ret, copy_lvb =0 ;int old_mode, new_mode;if (count ==sizeof (struct dlm_device_version )) {
@@ -906,9 +906,9 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,trace_dlm_ast (lkb->lkb_resource->res_ls, lkb); } - rv =copy_result_to_user (lkb->lkb_ua, -test_bit (DLM_PROC_FLAGS_COMPAT , &proc->flags), - cb->flags, cb->mode, copy_lvb, buf, count); + ret =copy_result_to_user (lkb->lkb_ua, +test_bit (DLM_PROC_FLAGS_COMPAT , &proc->flags), + cb->flags, cb->mode, copy_lvb, buf, count);kref_put (&cb->ref, dlm_release_callback);
@@ -916,7 +916,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,if (rv ==DLM_DEQUEUE_CALLBACK_LAST )dlm_put_lkb (lkb); -return rv; +return ret; }static __poll_t device_poll (struct file *file,poll_table *wait)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 162/399 soc: fsl: qbman: Always disable interrupts when taking cgr_lock
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit 584c2a9184a33a40fceee838f856de3cffa19be3 ]
smp_call_function_single disables IRQs when executing the callback. To prevent deadlocks, we must disable IRQs when taking cgr_lock elsewhere. This is already done by qman_update_cgr and qman_delete_cgr; fix the other lockers.
--- drivers/soc/fsl/qbman/qman.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/soc/fsl/qbman/qman.c +5 -5
@@ -1456,11 +1456,11 @@ static void qm_congestion_task(struct work_struct *work)union qm_mc_result *mcr;struct qman_cgr *cgr; -spin_lock (&p->cgr_lock); +spin_lock_irq (&p->cgr_lock);qm_mc_start (&p->p);qm_mc_commit (&p->p,QM_MCC_VERB_QUERYCONGESTION );if (!qm_mc_result_timeout (&p->p, &mcr)) { -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);dev_crit (p->config->dev,"QUERYCONGESTION timeout\n" );qman_p_irqsource_add (p,QM_PIRQ_CSCI );return ;
@@ -1476,7 +1476,7 @@ static void qm_congestion_task(struct work_struct *work)list_for_each_entry (cgr, &p->cgr_cbs, node)if (cgr->cb &&qman_cgrs_get (&c, cgr->cgrid)) cgr->cb (p, cgr,qman_cgrs_get (&rr, cgr->cgrid)); -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);qman_p_irqsource_add (p,QM_PIRQ_CSCI ); }
@@ -2440,7 +2440,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,preempt_enable (); cgr->chan = p->config->channel; -spin_lock (&p->cgr_lock); +spin_lock_irq (&p->cgr_lock);if (opts) {struct qm_mcc_initcgr local_opts = *opts;
@@ -2477,7 +2477,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, qman_cgrs_get(&p->cgrs[1], cgr->cgrid)) cgr->cb(p, cgr, 1); out: -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);put_affine_portal ();return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 163/399 soc: fsl: qbman: Use raw spinlock for cgr_lock
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit fbec4e7fed89b579f2483041fabf9650fb0dd6bc ]
smp_call_function always runs its callback in hard IRQ context, even on PREEMPT_RT, where spinlocks can sleep. So we need to use a raw spinlock for cgr_lock to ensure we aren't waiting on a sleeping task.
Although this bug has existed for a while, it was not apparent until commit ef2a8d5478b9 ("net: dpaa: Adjust queue depth on rate change") which invokes smp_call_function_single via qman_update_cgr_safe every time a link goes up or down.
--- drivers/soc/fsl/qbman/qman.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/soc/fsl/qbman/qman.c +14 -11
@@ -991,7 +991,7 @@ struct qman_portal {/* linked-list of CSCN handlers. */ struct list_head cgr_cbs;/* list lock */ -spinlock_t cgr_lock; +raw_spinlock_t cgr_lock;struct work_struct congestion_work;struct work_struct mr_work;char irqname[MAX_IRQNAME ];
@@ -1281,7 +1281,7 @@ static int qman_create_portal(struct qman_portal *portal,/* if the given mask is NULL, assume all CGRs can be seen */ qman_cgrs_fill (&portal->cgrs[0 ]);INIT_LIST_HEAD (&portal->cgr_cbs); -spin_lock_init (&portal->cgr_lock); +raw_spin_lock_init (&portal->cgr_lock);INIT_WORK (&portal->congestion_work, qm_congestion_task);INIT_WORK (&portal->mr_work, qm_mr_process_task); portal->bits =0 ;
@@ -1456,11 +1456,14 @@ static void qm_congestion_task(struct work_struct *work)union qm_mc_result *mcr;struct qman_cgr *cgr; -spin_lock_irq (&p->cgr_lock); +/* +* FIXME: QM_MCR_TIMEOUT is 10ms, which is too long for a raw spinlock! +*/ +raw_spin_lock_irq (&p->cgr_lock);qm_mc_start (&p->p);qm_mc_commit (&p->p,QM_MCC_VERB_QUERYCONGESTION );if (!qm_mc_result_timeout (&p->p, &mcr)) { -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);dev_crit (p->config->dev,"QUERYCONGESTION timeout\n" );qman_p_irqsource_add (p,QM_PIRQ_CSCI );return ;
@@ -1476,7 +1479,7 @@ static void qm_congestion_task(struct work_struct *work)list_for_each_entry (cgr, &p->cgr_cbs, node)if (cgr->cb &&qman_cgrs_get (&c, cgr->cgrid)) cgr->cb (p, cgr,qman_cgrs_get (&rr, cgr->cgrid)); -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);qman_p_irqsource_add (p,QM_PIRQ_CSCI ); }
@@ -2440,7 +2443,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,preempt_enable (); cgr->chan = p->config->channel; -spin_lock_irq (&p->cgr_lock); +raw_spin_lock_irq (&p->cgr_lock);if (opts) {struct qm_mcc_initcgr local_opts = *opts;
@@ -2477,7 +2480,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, qman_cgrs_get(&p->cgrs[1], cgr->cgrid)) cgr->cb(p, cgr, 1); out: -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);put_affine_portal ();return ret; }
@@ -2512,7 +2515,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)return -EINVAL ;memset (&local_opts,0 ,sizeof (struct qm_mcc_initcgr )); -spin_lock_irqsave (&p->cgr_lock, irqflags); +raw_spin_lock_irqsave (&p->cgr_lock, irqflags);list_del (&cgr->node);/* * If there are no other CGR objects for this CGRID in the list,
@@ -2537,7 +2540,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)/* add back to the list */ list_add (&cgr->node, &p->cgr_cbs); release_lock: -spin_unlock_irqrestore (&p->cgr_lock, irqflags); +raw_spin_unlock_irqrestore (&p->cgr_lock, irqflags);put_affine_portal ();return ret; }
@@ -2577,9 +2580,9 @@ static int qman_update_cgr(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts)if (!p)return -EINVAL ; -spin_lock_irqsave (&p->cgr_lock, irqflags); +raw_spin_lock_irqsave (&p->cgr_lock, irqflags); ret =qm_modify_cgr (cgr,0 , opts); -spin_unlock_irqrestore (&p->cgr_lock, irqflags); +raw_spin_unlock_irqrestore (&p->cgr_lock, irqflags);put_affine_portal ();return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 164/399 s390/zcrypt: fix reference counting on zcrypt card objects
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harald Freudenberger <[email protected]>
[ Upstream commit 50ed48c80fecbe17218afed4f8bed005c802976c ]
Tests with hot-plugging crytpo cards on KVM guests with debug kernel build revealed an use after free for the load field of the struct zcrypt_card. The reason was an incorrect reference handling of the zcrypt card object which could lead to a free of the zcrypt card object while it was still in use.
This is an example of the slab message:
kernel: 0x00000000885a7512-0x00000000885a7513 @offset=1298. First byte 0x68 instead of 0x6b
kernel: Allocated in zcrypt_card_alloc+0x36/0x70 [zcrypt] age=18046 cpu=3 pid=43
kernel: kmalloc_trace+0x3f2/0x470
kernel: zcrypt_card_alloc+0x36/0x70 [zcrypt]
kernel: zcrypt_cex4_card_probe+0x26/0x380 [zcrypt_cex4]
kernel: ap_device_probe+0x15c/0x290
kernel: really_probe+0xd2/0x468
kernel: driver_probe_device+0x40/0xf0
kernel: __device_attach_driver+0xc0/0x140
kernel: bus_for_each_drv+0x8c/0xd0
kernel: __device_attach+0x114/0x198
kernel: bus_probe_device+0xb4/0xc8
kernel: device_add+0x4d2/0x6e0
kernel: ap_scan_adapter+0x3d0/0x7c0
kernel: ap_scan_bus+0x5a/0x3b0
kernel: ap_scan_bus_wq_callback+0x40/0x60
kernel: process_one_work+0x26e/0x620
kernel: worker_thread+0x21c/0x440
kernel: Freed in zcrypt_card_put+0x54/0x80 [zcrypt] age=9024 cpu=3 pid=43
kernel: kfree+0x37e/0x418
kernel: zcrypt_card_put+0x54/0x80 [zcrypt]
kernel: ap_device_remove+0x4c/0xe0
kernel: device_release_driver_internal+0x1c4/0x270
kernel: bus_remove_device+0x100/0x188
kernel: device_del+0x164/0x3c0
kernel: device_unregister+0x30/0x90
kernel: ap_scan_adapter+0xc8/0x7c0
kernel: ap_scan_bus+0x5a/0x3b0
kernel: ap_scan_bus_wq_callback+0x40/0x60
kernel: process_one_work+0x26e/0x620
kernel: worker_thread+0x21c/0x440
kernel: kthread+0x150/0x168
kernel: __ret_from_fork+0x3c/0x58
kernel: ret_from_fork+0xa/0x30
kernel: Slab 0x00000372022169c0 objects=20 used=18 fp=0x00000000885a7c88 flags=0x3ffff00000000a00(workingset|slab|node=0|zone=1|lastcpupid=0x1ffff)
kernel: Object 0x00000000885a74b8 @offset=1208 fp=0x00000000885a7c88
kernel: Redzone 00000000885a74b0: bb bb bb bb bb bb bb bb ........
kernel: Object 00000000885a74b8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74c8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74d8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74e8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74f8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a7508: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 68 4b 6b 6b 6b a5 kkkkkkkkkkhKkkk.
kernel: Redzone 00000000885a7518: bb bb bb bb bb bb bb bb ........
kernel: Padding 00000000885a756c: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZ
kernel: CPU: 0 PID: 387 Comm: systemd-udevd Not tainted 6.8.0-HF #2
kernel: Hardware name: IBM 3931 A01 704 (KVM/Linux)
kernel: Call Trace:
kernel: [<00000000ca5ab5b8>] dump_stack_lvl+0x90/0x120
kernel: [<00000000c99d78bc>] check_bytes_and_report+0x114/0x140
kernel: [<00000000c99d53cc>] check_object+0x334/0x3f8
kernel: [<00000000c99d820c>] alloc_debug_processing+0xc4/0x1f8
kernel: [<00000000c99d852e>] get_partial_node.part.0+0x1ee/0x3e0
kernel: [<00000000c99d94ec>] ___slab_alloc+0xaf4/0x13c8
kernel: [<00000000c99d9e38>] __slab_alloc.constprop.0+0x78/0xb8
kernel: [<00000000c99dc8dc>] __kmalloc+0x434/0x590
kernel: [<00000000c9b4c0ce>] ext4_htree_store_dirent+0x4e/0x1c0
kernel: [<00000000c9b908a2>] htree_dirblock_to_tree+0x17a/0x3f0
kernel: [<00000000c9b919dc>] ext4_htree_fill_tree+0x134/0x400
kernel: [<00000000c9b4b3d0>] ext4_dx_readdir+0x160/0x2f0
kernel: [<00000000c9b4bedc>] ext4_readdir+0x5f4/0x760
kernel: [<00000000c9a7efc4>] iterate_dir+0xb4/0x280
kernel: [<00000000c9a7f1ea>] __do_sys_getdents64+0x5a/0x120
kernel: [<00000000ca5d6946>] __do_syscall+0x256/0x310
kernel: [<00000000ca5eea10>] system_call+0x70/0x98
kernel: INFO: lockdep is turned off.
kernel: FIX kmalloc-96: Restoring Poison 0x00000000885a7512-0x00000000885a7513=0x6b
kernel: FIX kmalloc-96: Marking all objects usedThe fix is simple: Before use of the queue not only the queue object but also the card object needs to increase it's reference count with a call to zcrypt_card_get(). Similar after use of the queue not only the queue but also the card object's reference count is decreased with zcrypt_card_put().
--- drivers/s390/crypto/zcrypt_api.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/s390/crypto/zcrypt_api.c +2 -0
@@ -579,6 +579,7 @@ static inline struct zcrypt_queue *zcrypt_pick_queue(struct zcrypt_card *zc, {if (!zq || !try_module_get (zq->queue->ap_dev.device.driver->owner))return NULL ; +zcrypt_card_get (zc);zcrypt_queue_get (zq);get_device (&zq->queue->ap_dev.device);atomic_add (weight, &zc->load);
@@ -598,6 +599,7 @@ static inline void zcrypt_drop_queue(struct zcrypt_card *zc,atomic_sub (weight, &zq->load);put_device (&zq->queue->ap_dev.device);zcrypt_queue_put (zq); +zcrypt_card_put (zc);module_put (mod); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 165/399 drm/probe-helper: warn about negative .get_modes()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 7af03e688792293ba33149fb8df619a8dff90e80 ]
The .get_modes() callback is supposed to return the number of modes, never a negative error code. If a negative value is returned, it'll just be interpreted as a negative count, and added to previous calculations.
Document the rules, but handle the negative values gracefully with an error message.
--- drivers/gpu/drm/drm_probe_helper.c | 7 +++++++ include/drm/drm_modeset_helper_vtables.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_probe_helper.c +7 -0
@@ -419,6 +419,13 @@ static int drm_helper_probe_get_modes(struct drm_connector *connector) count = connector_funcs->get_modes (connector); +/* The .get_modes() callback should not return negative values. */ +if (count <0 ) { +drm_err (connector->dev,".get_modes() returned %pe\n" , +ERR_PTR (count)); + count =0 ; + } +/* * Fallback for when DDC probe failed in drm_get_edid() and thus skipped * override/firmware EDID.
include/drm/drm_modeset_helper_vtables.h +2 -1
@@ -898,7 +898,8 @@ struct drm_connector_helper_funcs {* * RETURNS: * -* The number of modes added by calling drm_mode_probed_add(). +* The number of modes added by calling drm_mode_probed_add(). Return 0 +* on failures (no modes) instead of negative error codes. */ int (*get_modes)(struct drm_connector *connector);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 166/399 drm/panel: do not return negative error codes from drm_panel_get_modes()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit fc4e97726530241d96dd7db72eb65979217422c9 ]
None of the callers of drm_panel_get_modes() expect it to return negative error codes. Either they propagate the return value in their struct drm_connector_helper_funcs .get_modes() hook (which is also not supposed to return negative codes), or add it to other counts leading to bogus values.
On the other hand, many of the struct drm_panel_funcs .get_modes() hooks do return negative error codes, so handle them gracefully instead of propagating further.
Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/drm_panel.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_panel.c +11 -6
@@ -274,19 +274,24 @@ EXPORT_SYMBOL(drm_panel_disable);* The modes probed from the panel are automatically added to the connector * that the panel is attached to. * -* Return: The number of modes available from the panel on success or a -* negative error code on failure. +* Return: The number of modes available from the panel on success, or 0 on +* failure (no modes). */ int drm_panel_get_modes (struct drm_panel *panel,struct drm_connector *connector) {if (!panel) -return -EINVAL ; +return 0 ; -if (panel->funcs && panel->funcs->get_modes) -return panel->funcs->get_modes (panel, connector); +if (panel->funcs && panel->funcs->get_modes) { +int num; -return -EOPNOTSUPP ; + num = panel->funcs->get_modes (panel, connector); +if (num >0 ) +return num; + } + +return 0 ; }EXPORT_SYMBOL (drm_panel_get_modes);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 167/399 drm/exynos: do not return negative values from .get_modes()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 13d5b040363c7ec0ac29c2de9cf661a24a8aa531 ]
The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 ++-- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_vidi.c +2 -2
@@ -316,14 +316,14 @@ static int vidi_get_modes(struct drm_connector *connector)*/ if (!ctx->raw_edid) {DRM_DEV_DEBUG_KMS (ctx->dev,"raw_edid is null.\n" ); -return -EFAULT ; +return 0 ; } edid_len = (1 + ctx->raw_edid->extensions) *EDID_LENGTH ; edid =kmemdup (ctx->raw_edid, edid_len,GFP_KERNEL );if (!edid) {DRM_DEV_DEBUG_KMS (ctx->dev,"failed to allocate edid\n" ); -return -ENOMEM ; +return 0 ; }drm_connector_update_edid_property (connector, edid);
drivers/gpu/drm/exynos/exynos_hdmi.c +2 -2
@@ -887,11 +887,11 @@ static int hdmi_get_modes(struct drm_connector *connector)int ret;if (!hdata->ddc_adpt) -return -ENODEV ; +return 0 ; edid =drm_get_edid (connector, hdata->ddc_adpt);if (!edid) -return -ENODEV ; +return 0 ; hdata->dvi_mode = !connector->display_info.is_hdmi; DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 168/399 drm/imx/ipuv3: do not return negative values from .get_modes()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit c2da9ada64962fcd2e6395ed9987b9874ea032d3 ]
The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/imx/ipuv3/parallel-display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/ipuv3/parallel-display.c +2 -2
@@ -72,14 +72,14 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)int ret;if (!mode) -return -EINVAL ; +return 0 ; ret =of_get_drm_display_mode (np, &imxpd->mode, &imxpd->bus_flags,OF_USE_NATIVE_MODE );if (ret) {drm_mode_destroy (connector->dev, mode); -return ret; +return 0 ; }drm_mode_copy (mode, &imxpd->mode);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 169/399 drm/vc4: hdmi: do not return negative values from .get_modes()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit abf493988e380f25242c1023275c68bd3579c9ce ]
The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +1 -1
@@ -508,7 +508,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) edid =drm_get_edid (connector, vc4_hdmi->ddc);cec_s_phys_addr_from_edid (vc4_hdmi->cec_adap, edid);if (!edid) -return -ENODEV ; +return 0 ;drm_connector_update_edid_property (connector, edid); ret =drm_add_edid_modes (connector, edid);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 170/399 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ley Foon Tan <[email protected]>
[ Upstream commit 8248ca30ef89f9cc74ace62ae1b9a22b5f16736c ]
In the RISC-V specification, the stimecmp register doesn't have a default value. To prevent the timer interrupt from being triggered during timer initialization, clear the timer interrupt by writing stimecmp with a maximum value.
--- drivers/clocksource/timer-riscv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clocksource/timer-riscv.c +3 -0
@@ -108,6 +108,9 @@ static int riscv_timer_starting_cpu(unsigned int cpu) {struct clock_event_device *ce =per_cpu_ptr (&riscv_clock_event, cpu); +/* Clear timer interrupt */ +riscv_clock_event_stop (); + ce->cpumask =cpumask_of (cpu); ce->irq = riscv_clock_event_irq;if (riscv_timer_cannot_wake_cpu)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 171/399 memtest: use {READ,WRITE}_ONCE in memory scanning
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiang Zhang <[email protected]>
[ Upstream commit 82634d7e24271698e50a3ec811e5f50de790a65f ]
memtest failed to find bad memory when compiled with clang. So use {WRITE,READ}_ONCE to access memory to avoid compiler over optimization.
--- mm/memtest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/memtest.c +2 -2
@@ -51,10 +51,10 @@ static void __init memtest(u64 pattern, phys_addr_t start_phys, phys_addr_t size last_bad =0 ;for (p = start; p < end; p++) - *p = pattern; +WRITE_ONCE (*p, pattern);for (p = start; p < end; p++, start_phys_aligned += incr) { -if (*p == pattern) +if (READ_ONCE (*p) == pattern)continue ;if (start_phys_aligned == last_bad + incr) { last_bad += incr;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 172/399 Revert "block/mq-deadline: use correct way to throttling write requests"
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 256aab46e31683d76d45ccbedc287b4d3f3e322b ]
The code "max(1U, 3 * (1U << shift) / 4)" comes from the Kyber I/O scheduler. The Kyber I/O scheduler maintains one internal queue per hwq and hence derives its async_depth from the number of hwq tags. Using this approach for the mq-deadline scheduler is wrong since the mq-deadline scheduler maintains one internal queue for all hwqs combined. Hence this revert.
--- block/mq-deadline.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/mq-deadline.c +1 -2
@@ -646,9 +646,8 @@ static void dd_depth_updated(struct blk_mq_hw_ctx *hctx)struct request_queue *q = hctx->queue;struct deadline_data *dd = q->elevator->elevator_data;struct blk_mq_tags *tags = hctx->sched_tags; -unsigned int shift = tags->bitmap_tags.sb.shift; - dd->async_depth =max (1U ,3 * (1U << shift) /4 ); + dd->async_depth =max (1UL ,3 * q->nr_requests /4 );sbitmap_queue_min_shallow_depth (&tags->bitmap_tags, dd->async_depth); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 173/399 lsm: use 32-bit compatible data types in LSM syscalls
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Casey Schaufler <[email protected]>
[ Upstream commit a5a858f622a0aff5cdb5e271442cd01b2a01467f ]
Change the size parameters in lsm_list_modules(), lsm_set_self_attr() and lsm_get_self_attr() from size_t to u32. This avoids the need to have different interfaces for 32 and 64 bit systems.
--- include/linux/lsm_hook_defs.h | 4 ++-- include/linux/security.h | 8 ++++---- include/linux/syscalls.h | 6 +++--- security/apparmor/lsm.c | 4 ++-- security/lsm_syscalls.c | 10 +++++----- security/security.c | 12 ++++++------ security/selinux/hooks.c | 4 ++-- security/smack/smack_lsm.c | 4 ++-- tools/testing/selftests/lsm/common.h | 6 +++--- tools/testing/selftests/lsm/lsm_get_self_attr_test.c | 10 +++++----- tools/testing/selftests/lsm/lsm_list_modules_test.c | 8 ++++---- tools/testing/selftests/lsm/lsm_set_self_attr_test.c | 6 +++--- 12 files changed, 41 insertions(+), 41 deletions(-)
include/linux/lsm_hook_defs.h +2 -2
@@ -265,9 +265,9 @@ LSM_HOOK(int, 0, netlink_send, struct sock *sk, struct sk_buff *skb) LSM_HOOK(void, LSM_RET_VOID, d_instantiate, struct dentry *dentry, struct inode *inode) LSM_HOOK(int, -EOPNOTSUPP, getselfattr, unsigned int attr, - struct lsm_ctx __user *ctx, size_t *size, u32 flags) + struct lsm_ctx __user *ctx, u32 *size, u32 flags) LSM_HOOK(int, -EOPNOTSUPP, setselfattr, unsigned int attr, - struct lsm_ctx *ctx, size_t size, u32 flags) + struct lsm_ctx *ctx, u32 size, u32 flags) LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, const char *name, char **value) LSM_HOOK(int, -EINVAL, setprocattr, const char *name, void *value, size_t size)
include/linux/security.h +4 -4
@@ -478,9 +478,9 @@ int security_sem_semop(struct kern_ipc_perm *sma, struct sembuf *sops, unsigned nsops, int alter);void security_d_instantiate (struct dentry *dentry,struct inode *inode);int security_getselfattr (unsigned int attr,struct lsm_ctx __user *ctx, -size_t __user *size,u32 flags); +u32 __user *size,u32 flags);int security_setselfattr (unsigned int attr,struct lsm_ctx __user *ctx, -size_t size,u32 flags); +u32 size,u32 flags);int security_getprocattr (struct task_struct *p,int lsmid,const char *name,char **value);int security_setprocattr (int lsmid,const char *name,void *value,size_t size);
@@ -494,7 +494,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);int security_inode_setsecctx (struct dentry *dentry,void *ctx,u32 ctxlen);int security_inode_getsecctx (struct inode *inode,void **ctx,u32 *ctxlen);int security_locked_down (enum lockdown_reason what); -int lsm_fill_user_ctx (struct lsm_ctx __user *uctx,size_t *uctx_len, +int lsm_fill_user_ctx (struct lsm_ctx __user *uctx,u32 *uctx_len,void *val,size_t val_len,u64 id,u64 flags);#else /* CONFIG_SECURITY */
@@ -1434,7 +1434,7 @@ static inline int security_locked_down(enum lockdown_reason what)return 0 ; }static inline int lsm_fill_user_ctx (struct lsm_ctx __user *uctx, -size_t *uctx_len,void *val,size_t val_len, +u32 *uctx_len,void *val,size_t val_len,u64 id,u64 flags) {return -EOPNOTSUPP ;
include/linux/syscalls.h +3 -3
@@ -960,10 +960,10 @@ asmlinkage long sys_cachestat(unsigned int fd, struct cachestat __user *cstat, unsigned int flags);asmlinkage long sys_map_shadow_stack (unsigned long addr,unsigned long size,unsigned int flags);asmlinkage long sys_lsm_get_self_attr (unsigned int attr,struct lsm_ctx *ctx, -size_t *size,__u32 flags); +u32 *size,u32 flags);asmlinkage long sys_lsm_set_self_attr (unsigned int attr,struct lsm_ctx *ctx, -size_t size,__u32 flags); -asmlinkage long sys_lsm_list_modules (u64 *ids,size_t *size,u32 flags); +u32 size,u32 flags); +asmlinkage long sys_lsm_list_modules (u64 *ids,u32 *size,u32 flags);/* * Architecture-specific system calls
security/apparmor/lsm.c +2 -2
@@ -779,7 +779,7 @@ static int apparmor_sb_pivotroot(const struct path *old_path, }static int apparmor_getselfattr (unsigned int attr,struct lsm_ctx __user *lx, -size_t *size,u32 flags) +u32 *size,u32 flags) {int error = -ENOENT ;struct aa_task_ctx *ctx =task_ctx (current);
@@ -924,7 +924,7 @@ static int do_setattr(u64 attr, void *value, size_t size) }static int apparmor_setselfattr (unsigned int attr,struct lsm_ctx *ctx, -size_t size,u32 flags) +u32 size,u32 flags) {int rc;
security/lsm_syscalls.c +5 -5
@@ -53,7 +53,7 @@ u64 lsm_name_to_attr(const char *name)* value indicating the reason for the error is returned. */ SYSCALL_DEFINE4(lsm_set_self_attr, unsigned int, attr, struct lsm_ctx __user *, - ctx, size_t, size, u32, flags) + ctx, u32, size, u32, flags) {return security_setselfattr (attr, ctx, size, flags); }
@@ -75,7 +75,7 @@ SYSCALL_DEFINE4(lsm_set_self_attr, unsigned int, attr, struct lsm_ctx __user *,* a negative value indicating the error is returned. */ SYSCALL_DEFINE4(lsm_get_self_attr, unsigned int, attr, struct lsm_ctx __user *, - ctx, size_t __user *, size, u32, flags) + ctx, u32 __user *, size, u32, flags) {return security_getselfattr (attr, ctx, size, flags); }
@@ -93,11 +93,11 @@ SYSCALL_DEFINE4(lsm_get_self_attr, unsigned int, attr, struct lsm_ctx __user *,* required size. In all other cases a negative value indicating the * error is returned. */ -SYSCALL_DEFINE3(lsm_list_modules, u64 __user *, ids, size_t __user *, size, +SYSCALL_DEFINE3(lsm_list_modules, u64 __user *, ids, u32 __user *, size, u32, flags) { -size_t total_size = lsm_active_cnt *sizeof (*ids); -size_t usize; +u32 total_size = lsm_active_cnt *sizeof (*ids); +u32 usize;int i;if (flags)
security/security.c +6 -6
@@ -785,7 +785,7 @@ static int lsm_superblock_alloc(struct super_block *sb)* Returns 0 on success, -E2BIG if userspace buffer is not large enough, * -EFAULT on a copyout error, -ENOMEM if memory can't be allocated. */ -int lsm_fill_user_ctx (struct lsm_ctx __user *uctx,size_t *uctx_len, +int lsm_fill_user_ctx (struct lsm_ctx __user *uctx,u32 *uctx_len,void *val,size_t val_len,u64 id,u64 flags) {
@@ -3918,14 +3918,14 @@ EXPORT_SYMBOL(security_d_instantiate);* If @size is insufficient to contain the data -E2BIG is returned. */ int security_getselfattr (unsigned int attr,struct lsm_ctx __user *uctx, -size_t __user *size,u32 flags) +u32 __user *size,u32 flags) {struct security_hook_list *hp;struct lsm_ctx lctx = { .id =LSM_ID_UNDEF , };u8 __user *base = (u8 __user *)uctx; -size_t total =0 ; -size_t entrysize; -size_t left; +u32 entrysize; +u32 total =0 ; +u32 left;bool toobig = false;bool single = false;int count =0 ;
@@ -4011,7 +4011,7 @@ int security_getselfattr(unsigned int attr, struct lsm_ctx __user *uctx,* LSM specific failure. */ int security_setselfattr (unsigned int attr,struct lsm_ctx __user *uctx, -size_t size,u32 flags) +u32 size,u32 flags) {struct security_hook_list *hp;struct lsm_ctx *lctx;
security/selinux/hooks.c +2 -2
@@ -6556,7 +6556,7 @@ static int selinux_lsm_setattr(u64 attr, void *value, size_t size)* There will only ever be one attribute. */ static int selinux_getselfattr (unsigned int attr,struct lsm_ctx __user *ctx, -size_t *size,u32 flags) +u32 *size,u32 flags) {int rc;char *val =NULL ;
@@ -6571,7 +6571,7 @@ static int selinux_getselfattr(unsigned int attr, struct lsm_ctx __user *ctx, }static int selinux_setselfattr (unsigned int attr,struct lsm_ctx *ctx, -size_t size,u32 flags) +u32 size,u32 flags) {int rc;
security/smack/smack_lsm.c +2 -2
@@ -3651,7 +3651,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)* There will only ever be one attribute. */ static int smack_getselfattr (unsigned int attr,struct lsm_ctx __user *ctx, -size_t *size,u32 flags) +u32 *size,u32 flags) {int rc;struct smack_known *skp;
@@ -3772,7 +3772,7 @@ static int do_setattr(u64 attr, void *value, size_t size)* Returns 0 on success, an error code otherwise. */ static int smack_setselfattr (unsigned int attr,struct lsm_ctx *ctx, -size_t size,u32 flags) +u32 size,u32 flags) {int rc;
tools/testing/selftests/lsm/common.h +3 -3
@@ -7,7 +7,7 @@#ifndef lsm_get_self_attrstatic inline int lsm_get_self_attr (unsigned int attr,struct lsm_ctx *ctx, -size_t *size,__u32 flags) +__u32 *size,__u32 flags) {return syscall (__NR_lsm_get_self_attr, attr, ctx, size, flags); }
@@ -15,14 +15,14 @@ static inline int lsm_get_self_attr(unsigned int attr, struct lsm_ctx *ctx,#ifndef lsm_set_self_attrstatic inline int lsm_set_self_attr (unsigned int attr,struct lsm_ctx *ctx, -size_t size,__u32 flags) +__u32 size,__u32 flags) {return syscall (__NR_lsm_set_self_attr, attr, ctx, size, flags); }#endif #ifndef lsm_list_modules -static inline int lsm_list_modules (__u64 *ids,size_t *size,__u32 flags) +static inline int lsm_list_modules (__u64 *ids,__u32 *size,__u32 flags) {return syscall (__NR_lsm_list_modules, ids, size, flags); }
tools/testing/selftests/lsm/lsm_get_self_attr_test.c +5 -5
@@ -40,7 +40,7 @@ TEST(size_null_lsm_get_self_attr)TEST (ctx_null_lsm_get_self_attr) {const long page_size =sysconf (_SC_PAGESIZE); -size_t size = page_size; +__u32 size = page_size;int rc; rc =lsm_get_self_attr (LSM_ATTR_CURRENT ,NULL , &size,0 );
@@ -57,7 +57,7 @@ TEST(size_too_small_lsm_get_self_attr) {const long page_size =sysconf (_SC_PAGESIZE);struct lsm_ctx *ctx =calloc (page_size,1 ); -size_t size =1 ; +__u32 size =1 ;ASSERT_NE (NULL , ctx); errno =0 ;
@@ -77,7 +77,7 @@ TEST(flags_zero_lsm_get_self_attr)const long page_size =sysconf (_SC_PAGESIZE);struct lsm_ctx *ctx =calloc (page_size,1 );__u64 *syscall_lsms =calloc (page_size,1 ); -size_t size; +__u32 size;int lsmcount;int i;
@@ -117,7 +117,7 @@ TEST(flags_overset_lsm_get_self_attr) {const long page_size =sysconf (_SC_PAGESIZE);struct lsm_ctx *ctx =calloc (page_size,1 ); -size_t size; +__u32 size;ASSERT_NE (NULL , ctx);
@@ -140,7 +140,7 @@ TEST(flags_overset_lsm_get_self_attr)TEST (basic_lsm_get_self_attr) {const long page_size =sysconf (_SC_PAGESIZE); -size_t size = page_size; +__u32 size = page_size;struct lsm_ctx *ctx =calloc (page_size,1 );struct lsm_ctx *tctx =NULL ;__u64 *syscall_lsms =calloc (page_size,1 );
tools/testing/selftests/lsm/lsm_list_modules_test.c +4 -4
@@ -31,7 +31,7 @@ TEST(size_null_lsm_list_modules)TEST (ids_null_lsm_list_modules) {const long page_size =sysconf (_SC_PAGESIZE); -size_t size = page_size; +__u32 size = page_size; errno =0 ;ASSERT_EQ (-1 ,lsm_list_modules (NULL , &size,0 ));
@@ -43,7 +43,7 @@ TEST(size_too_small_lsm_list_modules) {const long page_size =sysconf (_SC_PAGESIZE);__u64 *syscall_lsms =calloc (page_size,1 ); -size_t size =1 ; +__u32 size =1 ;ASSERT_NE (NULL , syscall_lsms); errno =0 ;
@@ -58,7 +58,7 @@ TEST(flags_set_lsm_list_modules) {const long page_size =sysconf (_SC_PAGESIZE);__u64 *syscall_lsms =calloc (page_size,1 ); -size_t size = page_size; +__u32 size = page_size;ASSERT_NE (NULL , syscall_lsms); errno =0 ;
@@ -72,7 +72,7 @@ TEST(flags_set_lsm_list_modules)TEST (correct_lsm_list_modules) {const long page_size =sysconf (_SC_PAGESIZE); -size_t size = page_size; +__u32 size = page_size;__u64 *syscall_lsms =calloc (page_size,1 );char *sysfs_lsms =calloc (page_size,1 );char *name;
tools/testing/selftests/lsm/lsm_set_self_attr_test.c +3 -3
@@ -25,7 +25,7 @@ TEST(size_too_small_lsm_set_self_attr) {const long page_size =sysconf (_SC_PAGESIZE);struct lsm_ctx *ctx =calloc (page_size,1 ); -size_t size = page_size; +__u32 size = page_size;ASSERT_NE (NULL , ctx);if (attr_lsm_count ()) {
@@ -41,7 +41,7 @@ TEST(flags_zero_lsm_set_self_attr) {const long page_size =sysconf (_SC_PAGESIZE);struct lsm_ctx *ctx =calloc (page_size,1 ); -size_t size = page_size; +__u32 size = page_size;ASSERT_NE (NULL , ctx);if (attr_lsm_count ()) {
@@ -57,7 +57,7 @@ TEST(flags_overset_lsm_set_self_attr) {const long page_size =sysconf (_SC_PAGESIZE);char *ctx =calloc (page_size,1 ); -size_t size = page_size; +__u32 size = page_size;struct lsm_ctx *tctx = (struct lsm_ctx *)ctx;ASSERT_NE (NULL , ctx);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 174/399 lsm: handle the NULL buffer case in lsm_fill_user_ctx()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Moore <[email protected]>
[ Upstream commit eaf0e7a3d2711018789e9fdb89191d19aa139c47 ]
Passing a NULL buffer into the lsm_get_self_attr() syscall is a valid way to quickly determine the minimum size of the buffer needed to for the syscall to return all of the LSM attributes to the caller. Unfortunately we/I broke that behavior in commit d7cf3412a9f6 ("lsm: consolidate buffer size handling into lsm_fill_user_ctx()") such that it returned an error to the caller; this patch restores the original desired behavior of using the NULL buffer as a quick way to correctly size the attribute buffer.
--- security/security.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
security/security.c +7 -1
@@ -780,7 +780,9 @@ static int lsm_superblock_alloc(struct super_block *sb)* @id: LSM id * @flags: LSM defined flags * -* Fill all of the fields in a userspace lsm_ctx structure. +* Fill all of the fields in a userspace lsm_ctx structure. If @uctx is NULL +* simply calculate the required size to output via @utc_len and return +* success. * * Returns 0 on success, -E2BIG if userspace buffer is not large enough, * -EFAULT on a copyout error, -ENOMEM if memory can't be allocated.
@@ -799,6 +801,10 @@ int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len, goto out; } +/* no buffer - return success/0 and set @uctx_len to the req size */ +if (!uctx) + goto out; + nctx =kzalloc (nctx_len,GFP_KERNEL );if (nctx ==NULL ) { rc = -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 175/399 f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sunmin Jeong <[email protected]>
[ Upstream commit 4bf78322346f6320313683dc9464e5423423ad5c ]
In f2fs_update_inode, i_size of the atomic file isn't updated until FI_ATOMIC_COMMITTED flag is set. When committing atomic write right after the writeback of the inode, i_size of the raw inode will not be updated. It can cause the atomicity corruption due to a mismatch between old file size and new data.
To prevent the problem, let's mark inode dirty for FI_ATOMIC_COMMITTED
Atomic write thread Writeback thread
__writeback_single_inode
write_inode
f2fs_update_inode
- skip i_size update
f2fs_ioc_commit_atomic_write
f2fs_commit_atomic_write
set_inode_flag(inode, FI_ATOMIC_COMMITTED)
f2fs_do_sync_file
f2fs_fsync_node_pages
- skip f2fs_update_inode since the inode is clean
--- fs/f2fs/f2fs.h | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/f2fs.h +1 -0
@@ -3032,6 +3032,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,case FI_INLINE_DOTS :case FI_PIN_FILE :case FI_COMPRESS_RELEASED : +case FI_ATOMIC_COMMITTED :f2fs_mark_inode_dirty_sync (inode, true); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 176/399 f2fs: truncate page cache before clearing flags when aborting atomic write
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sunmin Jeong <[email protected]>
[ Upstream commit 74b0ebcbdde4c7fe23c979e4cfc2fdbf349c39a3 ]
In f2fs_do_write_data_page, FI_ATOMIC_FILE flag selects the target inode between the original inode and COW inode. When aborting atomic write and writeback occur simultaneously, invalid data can be written to original inode if the FI_ATOMIC_FILE flag is cleared meanwhile.
To prevent the problem, let's truncate all pages before clearing the flag
Atomic write thread Writeback thread
f2fs_abort_atomic_write
clear_inode_flag(inode, FI_ATOMIC_FILE)
__writeback_single_inode
do_writepages
f2fs_do_write_data_page
- use dn of original inode
truncate_inode_pages_final
--- fs/f2fs/segment.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +3 -1
@@ -192,6 +192,9 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)if (!f2fs_is_atomic_file (inode))return ; +if (clean) +truncate_inode_pages_final (inode->i_mapping); +release_atomic_write_cnt (inode);clear_inode_flag (inode,FI_ATOMIC_COMMITTED );clear_inode_flag (inode,FI_ATOMIC_REPLACE );
@@ -201,7 +204,6 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)F2FS_I (inode)->atomic_write_task =NULL ;if (clean) { -truncate_inode_pages_final (inode->i_mapping);f2fs_i_size_write (inode, fi->original_i_size); fi->original_i_size =0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 177/399 nilfs2: fix failure to detect DAT corruption in btree and direct mappings
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit f2f26b4a84a0ef41791bd2d70861c8eac748f4ba ]
Patch series "nilfs2: fix kernel bug at submit_bh_wbc()".
This resolves a kernel BUG reported by syzbot. Since there are two flaws involved, I've made each one a separate patch.
The first patch alone resolves the syzbot-reported bug, but I think both fixes should be sent to stable, so I've tagged them as such.
This patch (of 2):
Syzbot has reported a kernel bug in submit_bh_wbc() when writing file data to a nilfs2 file system whose metadata is corrupted.
There are two flaws involved in this issue.
The first flaw is that when nilfs_get_block() locates a data block using btree or direct mapping, if the disk address translation routine nilfs_dat_translate() fails with internal code -ENOENT due to DAT metadata corruption, it can be passed back to nilfs_get_block(). This causes nilfs_get_block() to misidentify an existing block as non-existent, causing both data block lookup and insertion to fail inconsistently.
The second flaw is that nilfs_get_block() returns a successful status in this inconsistent state. This causes the caller __block_write_begin_int() or others to request a read even though the buffer is not mapped, resulting in a BUG_ON check for the BH_Mapped flag in submit_bh_wbc() failing.
This fixes the first issue by changing the return value to code -EINVAL when a conversion using DAT fails with code -ENOENT, avoiding the conflicting condition that leads to the kernel bug described above. Here, code -EINVAL indicates that metadata corruption was detected during the block lookup, which will be properly handled as a file system error and converted to -EIO when passing through the nilfs2 bmap layer.
--- fs/nilfs2/btree.c | 9 +++++++-- fs/nilfs2/direct.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-)
fs/nilfs2/btree.c +7 -2
@@ -724,7 +724,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree, dat =nilfs_bmap_get_dat (btree); ret =nilfs_dat_translate (dat, ptr, &blocknr);if (ret <0 ) - goto out; + goto dat_error; ptr = blocknr; } cnt =1 ;
@@ -743,7 +743,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,if (dat) { ret =nilfs_dat_translate (dat, ptr2, &blocknr);if (ret <0 ) - goto out; + goto dat_error; ptr2 = blocknr; }if (ptr2 != ptr + cnt || ++cnt == maxblocks)
@@ -781,6 +781,11 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree, out:nilfs_btree_free_path (path);return ret; + + dat_error: +if (ret == -ENOENT ) + ret = -EINVAL ;/* Notify bmap layer of metadata corruption */ + goto out; } static void nilfs_btree_promote_key(struct nilfs_bmap *btree,
fs/nilfs2/direct.c +7 -2
@@ -66,7 +66,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct, dat =nilfs_bmap_get_dat (direct); ret =nilfs_dat_translate (dat, ptr, &blocknr);if (ret <0 ) -return ret; + goto dat_error; ptr = blocknr; }
@@ -79,7 +79,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct,if (dat) { ret =nilfs_dat_translate (dat, ptr2, &blocknr);if (ret <0 ) -return ret; + goto dat_error; ptr2 = blocknr; }if (ptr2 != ptr + cnt)
@@ -87,6 +87,11 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct, } *ptrp = ptr;return cnt; + + dat_error: +if (ret == -ENOENT ) + ret = -EINVAL ;/* Notify bmap layer of metadata corruption */ +return ret; } static __u64
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 178/399 nilfs2: prevent kernel bug at submit_bh_wbc()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit 269cdf353b5bdd15f1a079671b0f889113865f20 ]
Fix a bug where nilfs_get_block() returns a successful status when searching and inserting the specified block both fail inconsistently. If this inconsistent behavior is not due to a previously fixed bug, then an unexpected race is occurring, so return a temporary error -EAGAIN instead.
This prevents callers such as __block_write_begin_int() from requesting a read into a buffer that is not mapped, which would cause the BUG_ON check for the BH_Mapped flag in submit_bh_wbc() to fail.
--- fs/nilfs2/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nilfs2/inode.c +1 -1
@@ -112,7 +112,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,"%s (ino=%lu): a race condition while inserting a data block at offset=%llu" , __func__, inode->i_ino, (unsigned long long)blkoff); - err =0 ; + err = -EAGAIN ; }nilfs_transaction_abort (inode->i_sb); goto out;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 179/399 cifs: make sure server interfaces are requested only for SMB3+
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
[ Upstream commit 13c0a74747cb7fdadf58c5d3a7d52cfca2d51736 ]
Some code paths for querying server interfaces make a false assumption that it will only get called for SMB3+. Since this function now can get called from a generic code paths, the correct thing to do is to have specific handler for this functionality per SMB dialect, and call this handler.
This change adds such a handler and implements this handler only for SMB 3.0 and 3.1.1.
--- fs/smb/client/cifsglob.h | 3 +++ fs/smb/client/connect.c | 6 +++++- fs/smb/client/smb2ops.c | 2 ++ fs/smb/client/smb2pdu.c | 5 +++-- 4 files changed, 13 insertions(+), 3 deletions(-)
fs/smb/client/cifsglob.h +3 -0
@@ -346,6 +346,9 @@ struct smb_version_operations {/* informational QFS call */ void (*qfs_tcon)(const unsigned int ,struct cifs_tcon *,struct cifs_sb_info *); +/* query for server interfaces */ +int (*query_server_interfaces)(const unsigned int ,struct cifs_tcon *, +bool );/* check if a path is accessible or not */ int (*is_path_accessible)(const unsigned int ,struct cifs_tcon *,struct cifs_sb_info *,const char *);
fs/smb/client/connect.c +5 -1
@@ -123,12 +123,16 @@ static void smb2_query_server_interfaces(struct work_struct *work)struct cifs_tcon *tcon =container_of (work, struct cifs_tcon, query_interfaces.work); +struct TCP_Server_Info *server = tcon->ses->server;/* * query server network interfaces, in case they change */ +if (!server->ops->query_server_interfaces) +return ; + xid =get_xid (); - rc =SMB3_request_interfaces (xid, tcon, false); + rc = server->ops->query_server_interfaces (xid, tcon, false);free_xid (xid);if (rc) {
fs/smb/client/smb2ops.c +2 -0
@@ -5538,6 +5538,7 @@ struct smb_version_operations smb30_operations = { .tree_connect = SMB2_tcon, .tree_disconnect = SMB2_tdis, .qfs_tcon = smb3_qfs_tcon, + .query_server_interfaces = SMB3_request_interfaces, .is_path_accessible = smb2_is_path_accessible, .can_echo = smb2_can_echo, .echo = SMB2_echo,
@@ -5653,6 +5654,7 @@ struct smb_version_operations smb311_operations = { .tree_connect = SMB2_tcon, .tree_disconnect = SMB2_tdis, .qfs_tcon = smb3_qfs_tcon, + .query_server_interfaces = SMB3_request_interfaces, .is_path_accessible = smb2_is_path_accessible, .can_echo = smb2_can_echo, .echo = SMB2_echo,
fs/smb/client/smb2pdu.c +3 -2
@@ -409,14 +409,15 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon,spin_unlock (&ses->ses_lock);if (!rc && - (server->capabilities &SMB2_GLOBAL_CAP_MULTI_CHANNEL )) { + (server->capabilities &SMB2_GLOBAL_CAP_MULTI_CHANNEL ) && + server->ops->query_server_interfaces) {mutex_unlock (&ses->session_mutex);/* * query server network interfaces, in case they change */ xid =get_xid (); - rc =SMB3_request_interfaces (xid, tcon, false); + rc = server->ops->query_server_interfaces (xid, tcon, false);free_xid (xid);if (rc == -EOPNOTSUPP && ses->chan_count >1 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 180/399 cifs: reduce warning log level for server not advertising interfaces
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
[ Upstream commit 16a57d7681110b25708c7042688412238e6f73a9 ]
Several users have reported this log getting dumped too regularly to kernel log. The likely root cause has been identified, and it suggests that this situation is expected for some configurations (for example SMB2.1).
Since the function returns appropriately even for such cases, it is fairly harmless to make this a debug log. When needed, the verbosity can be increased to capture this log.
--- fs/smb/client/sess.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/client/sess.c +2 -2
@@ -230,7 +230,7 @@ int cifs_try_adding_channels(struct cifs_ses *ses)spin_lock (&ses->iface_lock);if (!ses->iface_count) {spin_unlock (&ses->iface_lock); -cifs_dbg (VFS ,"server %s does not advertise interfaces\n" , +cifs_dbg (ONCE ,"server %s does not advertise interfaces\n" , ses->server->hostname);break ; }
@@ -396,7 +396,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)spin_lock (&ses->iface_lock);if (!ses->iface_count) {spin_unlock (&ses->iface_lock); -cifs_dbg (VFS ,"server %s does not advertise interfaces\n" , ses->server->hostname); +cifs_dbg (ONCE ,"server %s does not advertise interfaces\n" , ses->server->hostname);return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 181/399 cifs: open_cached_dir(): add FILE_READ_EA to desired access
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eugene Korenevsky <[email protected]>
[ Upstream commit f1b8224b4e6ed59e7e6f5c548673c67410098d8d ]
Since smb2_query_eas() reads EA and uses cached directory, open_cached_dir() should request FILE_READ_EA access.
Otherwise listxattr() and getxattr() will fail with EACCES (0xc0000022 STATUS_ACCESS_DENIED SMB status).
--- fs/smb/client/cached_dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/smb/client/cached_dir.c +2 -1
@@ -239,7 +239,8 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, .tcon = tcon, .path = path, .create_options = cifs_create_options(cifs_sb, CREATE_NOT_FILE), - .desired_access = FILE_READ_DATA | FILE_READ_ATTRIBUTES, + .desired_access =FILE_READ_DATA |FILE_READ_ATTRIBUTES | + FILE_READ_EA, .disposition = FILE_OPEN, .fid = pfid, .replay = !!(retries),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 182/399 mtd: rawnand: Fix and simplify again the continuous read derivations
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
[ Upstream commit c7ee7c8d4b60fe46d4861b1200bc1c7ab657960a ]
We need to avoid the first page if we don't read it entirely. We need to avoid the last page if we don't read it entirely. While rather simple, this logic has been failed in the previous fix. This time I wrote about 30 unit tests locally to check each possible condition, hopefully I covered them all.
--- drivers/mtd/nand/raw/nand_base.c | 34 +++++++++++++++++++------------- 1 file changed, 20 insertions(+), 14 deletions(-)
drivers/mtd/nand/raw/nand_base.c +20 -14
@@ -3466,30 +3466,36 @@ static void rawnand_enable_cont_reads(struct nand_chip *chip, unsigned int page, u32 readlen, int col) {struct mtd_info *mtd =nand_to_mtd (chip); -unsigned int end_page, end_col; +unsigned int first_page, last_page; chip->cont_read.ongoing = false;if (!chip->controller->supported_op.cont_read)return ; - end_page =DIV_ROUND_UP (col + readlen, mtd->writesize); - end_col = (col + readlen) % mtd->writesize; +/* +* Don't bother making any calculations if the length is too small. +* Side effect: avoids possible integer underflows below. +*/ +if (readlen < (2 * mtd->writesize)) +return ; +/* Derive the page where continuous read should start (the first full page read) */ + first_page = page;if (col) - page++; - -if (end_col && end_page) - end_page--; + first_page++; -if (page +1 > end_page) -return ; - - chip->cont_read.first_page = page; - chip->cont_read.last_page = end_page; - chip->cont_read.ongoing = true; +/* Derive the page where continuous read should stop (the last full page read) */ + last_page = page + ((col + readlen) / mtd->writesize) -1 ; -rawnand_cap_cont_reads (chip); +/* Configure and enable continuous read when suitable */ +if (first_page < last_page) { + chip->cont_read.first_page = first_page; + chip->cont_read.last_page = last_page; + chip->cont_read.ongoing = true; +/* May reset the ongoing flag */ +rawnand_cap_cont_reads (chip); + } }static void rawnand_cont_read_skip_first_page (struct nand_chip *chip,unsigned int page)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 183/399 mtd: rawnand: Add a helper for calculating a page index
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
[ Upstream commit df9803bf5a91e3599f12b53c94722f2c4e144a86 ]
For LUN crossing boundaries, it is handy to know what is the index of the last page in a LUN. This helper will soon be reused. At the same time I rename page_per_lun to ppl in the calling function to clarify the lines.
--- drivers/mtd/nand/raw/nand_base.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/mtd/nand/raw/nand_base.c +11 -5
@@ -1211,19 +1211,25 @@ static int nand_lp_exec_read_page_op(struct nand_chip *chip, unsigned int page,return nand_exec_op (chip, &op); } +static unsigned int rawnand_last_page_of_lun (unsigned int pages_per_lun,unsigned int lun) +{ +/* lun is expected to be very small */ +return (lun * pages_per_lun) + pages_per_lun -1 ; +} +static void rawnand_cap_cont_reads (struct nand_chip *chip) {struct nand_memory_organization *memorg; -unsigned int pages_per_lun, first_lun, last_lun; +unsigned int ppl, first_lun, last_lun; memorg =nanddev_get_memorg (&chip->base); - pages_per_lun = memorg->pages_per_eraseblock * memorg->eraseblocks_per_lun; - first_lun = chip->cont_read.first_page / pages_per_lun; - last_lun = chip->cont_read.last_page / pages_per_lun; + ppl = memorg->pages_per_eraseblock * memorg->eraseblocks_per_lun; + first_lun = chip->cont_read.first_page / ppl; + last_lun = chip->cont_read.last_page / ppl;/* Prevent sequential cache reads across LUN boundaries */ if (first_lun != last_lun) - chip->cont_read.pause_page = first_lun * pages_per_lun + pages_per_lun -1 ; + chip->cont_read.pause_page =rawnand_last_page_of_lun (ppl, first_lun);else chip->cont_read.pause_page = chip->cont_read.last_page; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 184/399 mtd: rawnand: Ensure all continuous terms are always in sync
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
[ Upstream commit 6fb075fca63c3486612986eeff84ed4179644038 ]
While crossing a LUN boundary, it is probably safer (and clearer) to keep all members of the continuous read structure aligned, including the pause page (which is the last page of the lun or the last page of the continuous read). Once these members properly in sync, we can use the rawnand_cap_cont_reads() helper everywhere to "prepare" the next continuous read if there is one.
--- drivers/mtd/nand/raw/nand_base.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/nand_base.c +14 -9
@@ -1232,6 +1232,15 @@ static void rawnand_cap_cont_reads(struct nand_chip *chip) chip->cont_read.pause_page =rawnand_last_page_of_lun (ppl, first_lun); else chip->cont_read.pause_page = chip->cont_read.last_page; + +if (chip->cont_read.first_page == chip->cont_read.pause_page) { + chip->cont_read.first_page++; + chip->cont_read.pause_page =min (chip->cont_read.last_page, +rawnand_last_page_of_lun (ppl, first_lun +1 )); + } + +if (chip->cont_read.first_page >= chip->cont_read.last_page) + chip->cont_read.ongoing = false; } static int nand_lp_exec_cont_read_page_op(struct nand_chip *chip, unsigned int page,
@@ -1298,12 +1307,11 @@ static int nand_lp_exec_cont_read_page_op(struct nand_chip *chip, unsigned int pif (!chip->cont_read.ongoing)return 0 ; -if (page == chip->cont_read.pause_page && - page != chip->cont_read.last_page) { - chip->cont_read.first_page = chip->cont_read.pause_page +1 ; -rawnand_cap_cont_reads (chip); - }else if (page == chip->cont_read.last_page) { +if (page == chip->cont_read.last_page) { chip->cont_read.ongoing = false; + }else if (page == chip->cont_read.pause_page) { + chip->cont_read.first_page++; +rawnand_cap_cont_reads (chip); }return 0 ;
@@ -3510,10 +3518,7 @@ static void rawnand_cont_read_skip_first_page(struct nand_chip *chip, unsigned ireturn ; chip->cont_read.first_page++; -if (chip->cont_read.first_page == chip->cont_read.pause_page) - chip->cont_read.first_page++; -if (chip->cont_read.first_page >= chip->cont_read.last_page) - chip->cont_read.ongoing = false; +rawnand_cap_cont_reads (chip); }/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 185/399 mtd: rawnand: Constrain even more when continuous reads are enabled
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
[ Upstream commit 78ffbefba8d7822b232585570b293de5bc397da6 ]
As a matter of fact, continuous reads require additional handling at the operation level in order for them to work properly. The core helpers do have this additional logic now, but any time a controller implements its own page helper, this extra logic is "lost". This means we need another level of per-controller driver checks to ensure they can leverage continuous reads. This is for now unsupported, so in order to ensure continuous reads are enabled only when fully using the core page helpers, we need to add more initial checks.
Also, as performance is not relevant during raw accesses, we also prevent these from enabling the feature.
This should solve the issue seen with controllers such as the STM32 FMC2 when in sequencer mode. In this case, the continuous read feature would be enabled but not leveraged, and most importantly not disabled, leading to further operations to fail.
--- drivers/mtd/nand/raw/nand_base.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/nand_base.c +11 -1
@@ -3594,7 +3594,8 @@ static int nand_do_read_ops(struct nand_chip *chip, loff_t from, oob = ops->oobbuf; oob_required = oob ?1 :0 ; -rawnand_enable_cont_reads (chip, page, readlen, col); +if (likely (ops->mode !=MTD_OPS_RAW )) +rawnand_enable_cont_reads (chip, page, readlen, col);while (1 ) {struct mtd_ecc_stats ecc_stats = mtd->ecc_stats;
@@ -5212,6 +5213,15 @@ static void rawnand_late_check_supported_ops(struct nand_chip *chip)if (!nand_has_exec_op (chip))return ; +/* +* For now, continuous reads can only be used with the core page helpers. +* This can be extended later. +*/ +if (!(chip->ecc.read_page == nand_read_page_hwecc || + chip->ecc.read_page == nand_read_page_syndrome || + chip->ecc.read_page == nand_read_page_swecc)) +return ; +rawnand_check_cont_read_support (chip); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 186/399 cpufreq: dt: always allocate zeroed cpumask
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit d2399501c2c081eac703ca9597ceb83c7875a537 ]
Commit 0499a78369ad ("ARM64: Dynamically allocate cpumasks and increase supported CPUs to 512") changed the handling of cpumasks on ARM 64bit, what resulted in the strange issues and warnings during cpufreq-dt initialization on some big.LITTLE platforms.
This was caused by mixing OPPs between big and LITTLE cores, because OPP-sharing information between big and LITTLE cores is computed on cpumask, which in turn was not zeroed on allocation. Fix this by switching to zalloc_cpumask_var() call.
--- drivers/cpufreq/cpufreq-dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq-dt.c +1 -1
@@ -208,7 +208,7 @@ static int dt_cpufreq_early_init(struct device *dev, int cpu)if (!priv)return -ENOMEM ; -if (!alloc_cpumask_var (&priv->cpus,GFP_KERNEL )) +if (!zalloc_cpumask_var (&priv->cpus,GFP_KERNEL ))return -ENOMEM ;cpumask_set_cpu (cpu, priv->cpus);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 187/399 io_uring/futex: always remove futex entry for cancel all
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit 30dab608c3cb99c2a05b76289fd05551703979ae ]
We know the request is either being removed, or already in the process of being removed through task_work, so we can delete it from our futex list upfront. This is important for remove all conditions, as we otherwise will find it multiple times and prevent cancelation progress.
--- io_uring/futex.c | 1 + 1 file changed, 1 insertion(+)
io_uring/futex.c +1 -0
@@ -159,6 +159,7 @@ bool io_futex_remove_all(struct io_ring_ctx *ctx, struct task_struct *task,hlist_for_each_entry_safe (req, tmp, &ctx->futex_list, hash_node) {if (!io_match_task_safe (req, task, cancel_all))continue ; +hlist_del_init (&req->hash_node);__io_futex_cancel (ctx, req); found = true; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 188/399 io_uring/waitid: always remove waitid entry for cancel all
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit 2b35b8b43e07b1a6f06fdd84cf4b9eb24785896d ]
We know the request is either being removed, or already in the process of being removed through task_work, so we can delete it from our waitid list upfront. This is important for remove all conditions, as we otherwise will find it multiple times and prevent cancelation progress.
Remove the dead check in cancelation as well for the hash_node being empty or not. We already have a waitid reference check for ownership, so we don't need to check the list too.
--- io_uring/waitid.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
io_uring/waitid.c +1 -6
@@ -125,12 +125,6 @@ static void io_waitid_complete(struct io_kiocb *req, int ret)lockdep_assert_held (&req->ctx->uring_lock); -/* -* Did cancel find it meanwhile? -*/ -if (hlist_unhashed (&req->hash_node)) -return ; -hlist_del_init (&req->hash_node); ret =io_waitid_finish (req, ret);
@@ -202,6 +196,7 @@ bool io_waitid_remove_all(struct io_ring_ctx *ctx, struct task_struct *task,hlist_for_each_entry_safe (req, tmp, &ctx->waitid_list, hash_node) {if (!io_match_task_safe (req, task, cancel_all))continue ; +hlist_del_init (&req->hash_node);__io_waitid_cancel (ctx, req); found = true; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 189/399 x86/CPU/AMD: Update the Zenbleed microcode revisions
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov (AMD) <[email protected]>
[ Upstream commit 5c84b051bd4e777cf37aaff983277e58c99618d5 ]
Update them to the correct revision numbers.
--- arch/x86/kernel/cpu/amd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/amd.c +5 -5
@@ -989,11 +989,11 @@ static bool cpu_has_zenbleed_microcode(void)u32 good_rev =0 ;switch (boot_cpu_data.x86_model) { - case 0x30 ... 0x3f: good_rev = 0x0830107a; break; - case 0x60 ... 0x67: good_rev = 0x0860010b; break; - case 0x68 ... 0x6f: good_rev = 0x08608105; break; - case 0x70 ... 0x7f: good_rev = 0x08701032; break; - case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + case 0x30 ... 0x3f: good_rev = 0x0830107b; break; + case 0x60 ... 0x67: good_rev = 0x0860010c; break; + case 0x68 ... 0x6f: good_rev = 0x08608107; break; + case 0x70 ... 0x7f: good_rev = 0x08701033; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00009; break;default :return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 190/399 ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit a80a486d72e20bd12c335bcd38b6e6f19356b0aa ]
If ->NameOffset of smb2_create_req is smaller than Buffer offset of smb2_create_req, slab-out-of-bounds read can happen from smb2_open. This patch set the minimum value of the name offset to the buffer offset to validate name length of smb2_create_req().
--- fs/smb/server/smb2misc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/smb/server/smb2misc.c +4 -1
@@ -107,7 +107,10 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,case SMB2_CREATE : {unsigned short int name_off = -le16_to_cpu (((struct smb2_create_req *)hdr)->NameOffset); + max_t(unsigned short int, +le16_to_cpu (((struct smb2_create_req *)hdr)->NameOffset), + offsetof(struct smb2_create_req , Buffer)); +unsigned short int name_len =le16_to_cpu (((struct smb2_create_req *)hdr)->NameLength);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 191/399 net: esp: fix bad handling of pages from page_pool
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dragos Tatulea <[email protected]>
[ Upstream commit c3198822c6cb9fb588e446540485669cc81c5d34 ]
When the skb is reorganized during esp_output (!esp->inline), the pages coming from the original skb fragments are supposed to be released back to the system through put_page. But if the skb fragment pages are originating from a page_pool, calling put_page on them will trigger a page_pool leak which will eventually result in a crash.
This leak can be easily observed when using CONFIG_DEBUG_VM and doing ipsec + gre (non offloaded) forwarding:
BUG: Bad page state in process ksoftirqd/16 pfn:1451b6 page:00000000de2b8d32 refcount:0 mapcount:0 mapping:0000000000000000 index:0x1451b6000 pfn:0x1451b6 flags: 0x200000000000000(node=0|zone=2) page_type: 0xffffffff() raw: 0200000000000000 dead000000000040 ffff88810d23c000 0000000000000000 raw: 00000001451b6000 0000000000000001 00000000ffffffff 0000000000000000 page dumped because: page_pool leak Modules linked in: ip_gre gre mlx5_ib mlx5_core xt_conntrack xt_MASQUERADE nf_conntrack_netlink nfnetlink iptable_nat nf_nat xt_addrtype br_netfilter rpcrdma rdma_ucm ib_iser libiscsi scsi_transport_iscsi ib_umad rdma_cm ib_ipoib iw_cm ib_cm ib_uverbs ib_core overlay zram zsmalloc fuse [last unloaded: mlx5_core] CPU: 16 PID: 96 Comm: ksoftirqd/16 Not tainted 6.8.0-rc4+ #22 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x36/0x50 bad_page+0x70/0xf0 free_unref_page_prepare+0x27a/0x460 free_unref_page+0x38/0x120 esp_ssg_unref.isra.0+0x15f/0x200 esp_output_tail+0x66d/0x780 esp_xmit+0x2c5/0x360 validate_xmit_xfrm+0x313/0x370 ? validate_xmit_skb+0x1d/0x330 validate_xmit_skb_list+0x4c/0x70 sch_direct_xmit+0x23e/0x350 __dev_queue_xmit+0x337/0xba0 ? nf_hook_slow+0x3f/0xd0 ip_finish_output2+0x25e/0x580 iptunnel_xmit+0x19b/0x240 ip_tunnel_xmit+0x5fb/0xb60 ipgre_xmit+0x14d/0x280 [ip_gre] dev_hard_start_xmit+0xc3/0x1c0 __dev_queue_xmit+0x208/0xba0 ? nf_hook_slow+0x3f/0xd0 ip_finish_output2+0x1ca/0x580 ip_sublist_rcv_finish+0x32/0x40 ip_sublist_rcv+0x1b2/0x1f0 ? ip_rcv_finish_core.constprop.0+0x460/0x460 ip_list_rcv+0x103/0x130 __netif_receive_skb_list_core+0x181/0x1e0 netif_receive_skb_list_internal+0x1b3/0x2c0 napi_gro_receive+0xc8/0x200 gro_cell_poll+0x52/0x90 __napi_poll+0x25/0x1a0 net_rx_action+0x28e/0x300 __do_softirq+0xc3/0x276 ? sort_range+0x20/0x20 run_ksoftirqd+0x1e/0x30 smpboot_thread_fn+0xa6/0x130 kthread+0xcd/0x100 ? kthread_complete_and_exit+0x20/0x20 ret_from_fork+0x31/0x50 ? kthread_complete_and_exit+0x20/0x20 ret_from_fork_asm+0x11/0x20 </TASK>
The suggested fix is to introduce a new wrapper (skb_page_unref) that covers page refcounting for page_pool pages as well.
--- include/linux/skbuff.h | 10 ++++++++++ net/ipv4/esp4.c | 8 ++++---- net/ipv6/esp6.c | 8 ++++---- 3 files changed, 18 insertions(+), 8 deletions(-)
include/linux/skbuff.h +10 -0
@@ -3448,6 +3448,16 @@ static inline void skb_frag_ref(struct sk_buff *skb, int f)bool napi_pp_put_page (struct page *page,bool napi_safe); +static inline void +skb_page_unref (const struct sk_buff *skb,struct page *page,bool napi_safe) +{ +#ifdef CONFIG_PAGE_POOL +if (skb->pp_recycle &&napi_pp_put_page (page, napi_safe)) +return ; +#endif +put_page (page); +} +static inline void napi_frag_unref (skb_frag_t *frag,bool recycle,bool napi_safe) {
net/ipv4/esp4.c +4 -4
@@ -95,7 +95,7 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead, __alignof__(struct scatterlist)); } -static void esp_ssg_unref (struct xfrm_state *x,void *tmp) +static void esp_ssg_unref (struct xfrm_state *x,void *tmp,struct sk_buff *skb) {struct crypto_aead *aead = x->data;int extralen =0 ;
@@ -114,7 +114,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp)*/ if (req->src != req->dst)for (sg =sg_next (req->src); sg; sg =sg_next (sg)) -put_page (sg_page (sg)); +skb_page_unref (skb,sg_page (sg), false); }#ifdef CONFIG_INET_ESPINTCP
@@ -260,7 +260,7 @@ static void esp_output_done(void *data, int err) } tmp =ESP_SKB_CB (skb)->tmp; -esp_ssg_unref (x, tmp); +esp_ssg_unref (x, tmp, skb);kfree (tmp);if (xo && (xo->flags &XFRM_DEV_RESUME )) {
@@ -639,7 +639,7 @@ int esp_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * }if (sg != dsg) -esp_ssg_unref (x, tmp); +esp_ssg_unref (x, tmp, skb);if (!err && x->encap && x->encap->encap_type ==TCP_ENCAP_ESPINTCP ) err =esp_output_tail_tcp (x, skb);
net/ipv6/esp6.c +4 -4
@@ -112,7 +112,7 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead, __alignof__(struct scatterlist)); } -static void esp_ssg_unref (struct xfrm_state *x,void *tmp) +static void esp_ssg_unref (struct xfrm_state *x,void *tmp,struct sk_buff *skb) {struct crypto_aead *aead = x->data;int extralen =0 ;
@@ -131,7 +131,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp)*/ if (req->src != req->dst)for (sg =sg_next (req->src); sg; sg =sg_next (sg)) -put_page (sg_page (sg)); +skb_page_unref (skb,sg_page (sg), false); }#ifdef CONFIG_INET6_ESPINTCP
@@ -294,7 +294,7 @@ static void esp_output_done(void *data, int err) } tmp =ESP_SKB_CB (skb)->tmp; -esp_ssg_unref (x, tmp); +esp_ssg_unref (x, tmp, skb);kfree (tmp);esp_output_encap_csum (skb);
@@ -677,7 +677,7 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info }if (sg != dsg) -esp_ssg_unref (x, tmp); +esp_ssg_unref (x, tmp, skb);if (!err && x->encap && x->encap->encap_type ==TCP_ENCAP_ESPINTCP ) err =esp_output_tail_tcp (x, skb);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 192/399 NFSD: Fix nfsd_clid_class use of __string_len() macro
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 9388a2aa453321bcf1ad2603959debea9e6ab6d4 ]
I'm working on restructuring the __string* macros so that it doesn't need to recalculate the string twice. That is, it will save it off when processing __string() and the __assign_str() will not need to do the work again as it currently does.
Currently __string_len(item, src, len) doesn't actually use "src", but my changes will require src to be correct as that is where the __assign_str() will get its value from.
The event class nfsd_clid_class has:
__string_len(name, name, clp->cl_name.len)
But the second "name" does not exist and causes my changes to fail to build. That second parameter should be: clp->cl_name.data.
--- fs/nfsd/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/trace.h +1 -1
@@ -843,7 +843,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class, __array(unsigned char, addr, sizeof(struct sockaddr_in6)) __field(unsigned long, flavor) __array(unsigned char, verifier, NFS4_VERIFIER_SIZE) - __string_len(name, name, clp->cl_name.len) + __string_len(name, clp->cl_name.data, clp->cl_name.len) ),TP_fast_assign ( __entry->cl_boot = clp->cl_clientid.cl_boot;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 193/399 drm/i915: Add missing ; to __assign_str() macros in tracepoint code
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 0df4c388a1e310400a6e90fb10b286e2673756f0 ]
I'm working on improving the __assign_str() and __string() macros to be more efficient, and removed some unneeded semicolons. This triggered a bug in the build as some of the __assign_str() macros in intel_display_trace was missing a terminating semicolon.
--- drivers/gpu/drm/i915/display/intel_display_trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display_trace.h +3 -3
@@ -411,7 +411,7 @@ TRACE_EVENT(intel_fbc_activate,struct intel_crtc *crtc =intel_crtc_for_pipe (to_i915 (plane->base.dev), plane->pipe);__assign_str (dev,__dev_name_kms (plane)); -__assign_str (name, plane->base.name) +__assign_str (name, plane->base.name); __entry->pipe = crtc->pipe; __entry->frame =intel_crtc_get_vblank_counter (crtc); __entry->scanline =intel_get_crtc_scanline (crtc);
@@ -438,7 +438,7 @@ TRACE_EVENT(intel_fbc_deactivate,struct intel_crtc *crtc =intel_crtc_for_pipe (to_i915 (plane->base.dev), plane->pipe);__assign_str (dev,__dev_name_kms (plane)); -__assign_str (name, plane->base.name) +__assign_str (name, plane->base.name); __entry->pipe = crtc->pipe; __entry->frame =intel_crtc_get_vblank_counter (crtc); __entry->scanline =intel_get_crtc_scanline (crtc);
@@ -465,7 +465,7 @@ TRACE_EVENT(intel_fbc_nuke,struct intel_crtc *crtc =intel_crtc_for_pipe (to_i915 (plane->base.dev), plane->pipe);__assign_str (dev,__dev_name_kms (plane)); -__assign_str (name, plane->base.name) +__assign_str (name, plane->base.name); __entry->pipe = crtc->pipe; __entry->frame =intel_crtc_get_vblank_counter (crtc); __entry->scanline =intel_get_crtc_scanline (crtc);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 194/399 net: hns3: tracing: fix hclgevf trace event strings
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 3f9952e8d80cca2da3b47ecd5ad9ec16cfd1a649 ]
The __string() and __assign_str() helper macros of the TRACE_EVENT() macro are going through some optimizations where only the source string of __string() will be used and the __assign_str() source will be ignored and later removed.
To make sure that there's no issues, a new check is added between the __string() src argument and the __assign_str() src argument that does a strcmp() to make sure they are the same string.
The hclgevf trace events have:
__assign_str(devname, &hdev->nic.kinfo.netdev->name);
Which triggers the warning:
hclgevf_trace.h:34:39: error: passing argument 1 of ‘strcmp’ from incompatible pointer type [-Werror=incompatible-pointer-types]
34 | __assign_str(devname, &hdev->nic.kinfo.netdev->name);
[..]arch/x86/include/asm/string_64.h:75:24: note: expected ‘const char *’ but argument is of type ‘char (*)[16]’
75 | int strcmp(const char *cs, const char *ct);
| ~~~~~~~~~~~~^~Because __assign_str() now has:
WARN_ON_ONCE(__builtin_constant_p(src) ? \ strcmp((src), __data_offsets.dst##_ptr_) : \ (src) != __data_offsets.dst##_ptr_); \
The problem is the '&' on hdev->nic.kinfo.netdev->name. That's because that name is:
char name[IFNAMSIZ]
Where passing an address '&' of a char array is not compatible with strcmp().
The '&' is not necessary, remove it.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 8 ++++---- .../net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h +4 -4
@@ -24,7 +24,7 @@ TRACE_EVENT(hclge_pf_mbx_get, __field(u8, code) __field(u8, subcode) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->vport[0].nic.kinfo.netdev->name) + __string(devname, hdev->vport[0].nic.kinfo.netdev->name)__array (u32, mbx_data,PF_GET_MBX_LEN ) ),
@@ -33,7 +33,7 @@ TRACE_EVENT(hclge_pf_mbx_get, __entry->code = req->msg.code; __entry->subcode = req->msg.subcode;__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->vport[0 ].nic.kinfo.netdev->name); +__assign_str (devname, hdev->vport[0 ].nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_vf_to_pf_cmd )); ),
@@ -56,7 +56,7 @@ TRACE_EVENT(hclge_pf_mbx_send, __field(u8, vfid) __field(u16, code) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->vport[0].nic.kinfo.netdev->name) + __string(devname, hdev->vport[0].nic.kinfo.netdev->name)__array (u32, mbx_data,PF_SEND_MBX_LEN ) ),
@@ -64,7 +64,7 @@ TRACE_EVENT(hclge_pf_mbx_send, __entry->vfid = req->dest_vfid; __entry->code =le16_to_cpu (req->msg.code);__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->vport[0 ].nic.kinfo.netdev->name); +__assign_str (devname, hdev->vport[0 ].nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_pf_to_vf_cmd )); ),
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h +4 -4
@@ -23,7 +23,7 @@ TRACE_EVENT(hclge_vf_mbx_get, __field(u8, vfid) __field(u16, code) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->nic.kinfo.netdev->name) + __string(devname, hdev->nic.kinfo.netdev->name)__array (u32, mbx_data,VF_GET_MBX_LEN ) ),
@@ -31,7 +31,7 @@ TRACE_EVENT(hclge_vf_mbx_get, __entry->vfid = req->dest_vfid; __entry->code =le16_to_cpu (req->msg.code);__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->nic.kinfo.netdev->name); +__assign_str (devname, hdev->nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_pf_to_vf_cmd )); ),
@@ -55,7 +55,7 @@ TRACE_EVENT(hclge_vf_mbx_send, __field(u8, code) __field(u8, subcode) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->nic.kinfo.netdev->name) + __string(devname, hdev->nic.kinfo.netdev->name)__array (u32, mbx_data,VF_SEND_MBX_LEN ) ),
@@ -64,7 +64,7 @@ TRACE_EVENT(hclge_vf_mbx_send, __entry->code = req->msg.code; __entry->subcode = req->msg.subcode;__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->nic.kinfo.netdev->name); +__assign_str (devname, hdev->nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_vf_to_pf_cmd )); ),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 195/399 cxl/trace: Properly initialize cxl_poison region name
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alison Schofield <[email protected]>
[ Upstream commit 6c871260965255a1c142fb77ccee58b172d1690b ]
The TP_STRUCT__entry that gets assigned the region name, or an empty string if no region is present, is erroneously initialized to the cxl_region pointer. It needs to be properly initialized otherwise it's length is wrong and garbage chars can appear in the kernel trace output: /sys/kernel/tracing/trace
The bad initialization was due in part to a naming conflict with the parameter: struct cxl_region *region. The field 'region' is already exposed externally as the region name, so changing that to something logical, like 'region_name' is not an option. Instead rename the internal only struct cxl_region to the commonly used 'cxlr'.
Impact is that tooling depending on that trace data can miss picking up a valid event when searching by region name. The TP_printk() output, if enabled, does emit the correct region names in the dmesg log.
This was found during testing of the cxl-list option to report media-errors for a region.
--- drivers/cxl/core/trace.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/cxl/core/trace.h +7 -7
@@ -646,18 +646,18 @@ u64 cxl_trace_hpa(struct cxl_region *cxlr, struct cxl_memdev *memdev, u64 dpa); TRACE_EVENT(cxl_poison, - TP_PROTO(struct cxl_memdev *cxlmd, struct cxl_region *region, + TP_PROTO(struct cxl_memdev *cxlmd, struct cxl_region *cxlr, const struct cxl_poison_record *record, u8 flags, __le64 overflow_ts, enum cxl_poison_trace_type trace_type), - TP_ARGS(cxlmd, region, record, flags, overflow_ts, trace_type), + TP_ARGS(cxlmd, cxlr, record, flags, overflow_ts, trace_type), TP_STRUCT__entry( __string(memdev, dev_name(&cxlmd->dev)) __string(host, dev_name(cxlmd->dev.parent)) __field(u64, serial) __field(u8, trace_type) - __string(region, region) + __string(region, cxlr ? dev_name(&cxlr->dev) : "") __field(u64, overflow_ts) __field(u64, hpa) __field(u64, dpa)
@@ -677,10 +677,10 @@ TRACE_EVENT(cxl_poison, __entry->source =cxl_poison_record_source (record); __entry->trace_type = trace_type; __entry->flags = flags; -if (region) { -__assign_str (region,dev_name (®ion->dev)); -memcpy (__entry->uuid, ®ion->params.uuid,16 ); - __entry->hpa =cxl_trace_hpa (region, cxlmd, +if (cxlr) { +__assign_str (region,dev_name (&cxlr->dev)); +memcpy (__entry->uuid, &cxlr->params.uuid,16 ); + __entry->hpa =cxl_trace_hpa (cxlr, cxlmd, __entry->dpa); }else {__assign_str (region,"" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 196/399 ksmbd: fix potencial out-of-bounds when buffer offset is invalid
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit c6cd2e8d2d9aa7ee35b1fa6a668e32a22a9753da ]
I found potencial out-of-bounds when buffer offset fields of a few requests is invalid. This patch set the minimum value of buffer offset field to ->Buffer offset to validate buffer length.
--- fs/smb/server/smb2misc.c | 23 +++++++++++++------ fs/smb/server/smb2pdu.c | 48 ++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 29 deletions(-)
fs/smb/server/smb2misc.c +16 -7
@@ -101,7 +101,9 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, *len =le16_to_cpu (((struct smb2_sess_setup_req *)hdr)->SecurityBufferLength);break ;case SMB2_TREE_CONNECT : - *off =le16_to_cpu (((struct smb2_tree_connect_req *)hdr)->PathOffset); + *off = max_t(unsigned short int, +le16_to_cpu (((struct smb2_tree_connect_req *)hdr)->PathOffset), + offsetof(struct smb2_tree_connect_req , Buffer)); *len =le16_to_cpu (((struct smb2_tree_connect_req *)hdr)->PathLength);break ;case SMB2_CREATE :
@@ -110,7 +112,6 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, max_t(unsigned short int,le16_to_cpu (((struct smb2_create_req *)hdr)->NameOffset), offsetof(struct smb2_create_req, Buffer)); -unsigned short int name_len =le16_to_cpu (((struct smb2_create_req *)hdr)->NameLength);
@@ -131,11 +132,15 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,break ; }case SMB2_QUERY_INFO : - *off =le16_to_cpu (((struct smb2_query_info_req *)hdr)->InputBufferOffset); + *off = max_t(unsigned int, +le16_to_cpu (((struct smb2_query_info_req *)hdr)->InputBufferOffset), + offsetof(struct smb2_query_info_req , Buffer)); *len =le32_to_cpu (((struct smb2_query_info_req *)hdr)->InputBufferLength);break ;case SMB2_SET_INFO : - *off =le16_to_cpu (((struct smb2_set_info_req *)hdr)->BufferOffset); + *off = max_t(unsigned int, +le16_to_cpu (((struct smb2_set_info_req *)hdr)->BufferOffset), + offsetof(struct smb2_set_info_req , Buffer)); *len =le32_to_cpu (((struct smb2_set_info_req *)hdr)->BufferLength);break ;case SMB2_READ :
@@ -145,7 +150,7 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,case SMB2_WRITE :if (((struct smb2_write_req *)hdr)->DataOffset || ((struct smb2_write_req *)hdr)->Length) { - *off = max_t(unsigned int, + *off = max_t(unsigned short int,le16_to_cpu (((struct smb2_write_req *)hdr)->DataOffset), offsetof(struct smb2_write_req , Buffer)); *len =le32_to_cpu (((struct smb2_write_req *)hdr)->Length);
@@ -156,7 +161,9 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, *len =le16_to_cpu (((struct smb2_write_req *)hdr)->WriteChannelInfoLength);break ;case SMB2_QUERY_DIRECTORY : - *off =le16_to_cpu (((struct smb2_query_directory_req *)hdr)->FileNameOffset); + *off = max_t(unsigned short int, +le16_to_cpu (((struct smb2_query_directory_req *)hdr)->FileNameOffset), + offsetof(struct smb2_query_directory_req , Buffer)); *len =le16_to_cpu (((struct smb2_query_directory_req *)hdr)->FileNameLength);break ;case SMB2_LOCK :
@@ -171,7 +178,9 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,break ; }case SMB2_IOCTL : - *off =le32_to_cpu (((struct smb2_ioctl_req *)hdr)->InputOffset); + *off = max_t(unsigned int, +le32_to_cpu (((struct smb2_ioctl_req *)hdr)->InputOffset), + offsetof(struct smb2_ioctl_req , Buffer)); *len =le32_to_cpu (((struct smb2_ioctl_req *)hdr)->InputCount);break ;default :
fs/smb/server/smb2pdu.c +26 -22
192 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 197/399 virtio: reenable config if freezing device failed
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit 310227f42882c52356b523e2f4e11690eebcd2ab ]
Currently, we don't reenable the config if freezing the device failed.
For example, virtio-mem currently doesn't support suspend+resume, and trying to freeze the device will always fail. Afterwards, the device will no longer respond to resize requests, because it won't get notified about config changes.
Let's fix this by re-enabling the config if freezing fails.
Message-Id: <[email protected]>
--- drivers/virtio/virtio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/virtio/virtio.c +3 -1
@@ -510,8 +510,10 @@ int virtio_device_freeze(struct virtio_device *dev)if (drv && drv->freeze) { ret = drv->freeze (dev); -if (ret) +if (ret) { +virtio_config_enable (dev);return ret; + } }if (dev->config->destroy_avq)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 198/399 LoongArch: Change __my_cpu_offset definition to avoid mis-optimization
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit c87e12e0e8c1241410e758e181ca6bf23efa5b5b ]
Quoted 1 line
From GCC commit
3f13154553f8546a("df-scan: remove ad-hoc handling of
global regs in asms"), global registers will no longer be forced to add to the def-use chain. Then current_thread_info(), current_stack_pointer and __my_cpu_offset may be lifted out of the loop because they are no longer treated as "volatile variables".
This optimization is still correct for the current_thread_info() and current_stack_pointer usages because they are associated to a thread. However it is wrong for __my_cpu_offset because it is associated to a CPU rather than a thread: if the thread migrates to a different CPU in the loop, __my_cpu_offset should be changed.
Change __my_cpu_offset definition to treat it as a "volatile variable", in order to avoid such a mis-optimization.
--- arch/loongarch/include/asm/percpu.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/loongarch/include/asm/percpu.h +6 -1
@@ -29,7 +29,12 @@ static inline void set_my_cpu_offset(unsigned long off) __my_cpu_offset = off;csr_write64 (off,PERCPU_BASE_KS ); } -#define __my_cpu_offset __my_cpu_offset + +#define __my_cpu_offset \ +({ \ + __asm__ __volatile__("":"+r"(__my_cpu_offset)); \ + __my_cpu_offset; \ +})#define PERCPU_OP (op, asm_op, c_op) \ static __always_inline unsigned long __percpu_##op(void *ptr, \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 199/399 LoongArch: Define the __io_aw() hook as mmiowb()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 9c68ece8b2a5c5ff9b2fcaea923dd73efeb174cd ]
Commit fb24ea52f78e0d595852e ("drivers: Remove explicit invocations of mmiowb()") remove all mmiowb() in drivers, but it says:
"NOTE: mmiowb() has only ever guaranteed ordering in conjunction with spin_unlock(). However, pairing each mmiowb() removal in this patch with the corresponding call to spin_unlock() is not at all trivial, so there is a small chance that this change may regress any drivers incorrectly relying on mmiowb() to order MMIO writes between CPUs using lock-free synchronisation."
The mmio in radeon_ring_commit() is protected by a mutex rather than a spinlock, but in the mutex fastpath it behaves similar to spinlock. We can add mmiowb() calls in the radeon driver but the maintainer says he doesn't like such a workaround, and radeon is not the only example of mutex protected mmio.
So we should extend the mmiowb tracking system from spinlock to mutex, and maybe other locking primitives. This is not easy and error prone, so we solve it in the architectural code, by simply defining the __io_aw() hook as mmiowb(). And we no longer need to override queued_spin_unlock() so use the generic definition.
Without this, we get such an error when run 'glxgears' on weak ordering architectures such as LoongArch:
radeon 0000:04:00.0: ring 0 stalled for more than 10324msec
radeon 0000:04:00.0: ring 3 stalled for more than 10240msec
radeon 0000:04:00.0: GPU lockup (current fence id 0x000000000001f412 last fence id 0x000000000001f414 on ring 3) radeon 0000:04:00.0: GPU lockup (current fence id 0x000000000000f940 last fence id 0x000000000000f941 on ring 0) radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
--- arch/loongarch/include/asm/Kbuild | 1 + arch/loongarch/include/asm/io.h | 2 ++ arch/loongarch/include/asm/qspinlock.h | 18 ------------------ 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 arch/loongarch/include/asm/qspinlock.h
arch/loongarch/include/asm/Kbuild +1 -0
@@ -4,6 +4,7 @@ generic-y += mcs_spinlock.h generic-y += parport.h generic-y += early_ioremap.h generic-y += qrwlock.h +generic-y += qspinlock.h generic-y += rwsem.h generic-y += segment.h generic-y += user.h
arch/loongarch/include/asm/io.h +2 -0
@@ -71,6 +71,8 @@ extern void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t#define memcpy_fromio (a, c, l) __memcpy_fromio((a), (c), (l))#define memcpy_toio (c, a, l) __memcpy_toio((c), (a), (l)) +#define __io_aw () mmiowb() +#include <asm-generic/io.h> #define ARCH_HAS_VALID_PHYS_ADDR_RANGE
arch/loongarch/include/asm/qspinlock.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_QSPINLOCK_H -#define _ASM_QSPINLOCK_H - -#include <asm-generic/qspinlock_types.h> - -#define queued_spin_unlock queued_spin_unlock - -static inline void queued_spin_unlock (struct qspinlock *lock) -{ -compiletime_assert_atomic_type (lock->locked); -c_sync (); -WRITE_ONCE (lock->locked,0 ); -} - -#include <asm-generic/qspinlock.h> - -#endif /* _ASM_QSPINLOCK_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 200/399 LoongArch/crypto: Clean up useless assignment operations
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuli Wang <[email protected]>
[ Upstream commit fea1c949f6ca5059e12de00d0483645debc5b206 ]
The LoongArch CRC32 hw acceleration is based on arch/mips/crypto/ crc32-mips.c. While the MIPS code supports both MIPS32 and MIPS64, but LoongArch32 lacks the CRC instruction. As a result, the line "len -= sizeof(u32)" is unnecessary.
Removing it can make context code style more unified and improve code readability.
--- arch/loongarch/crypto/crc32-loongarch.c | 2 -- 1 file changed, 2 deletions(-)
arch/loongarch/crypto/crc32-loongarch.c +0 -2
@@ -44,7 +44,6 @@ static u32 crc32_loongarch_hw(u32 crc_, const u8 *p, unsigned int len)CRC32 (crc, value, w); p +=sizeof (u32); - len -=sizeof (u32); }if (len &sizeof (u16)) {
@@ -80,7 +79,6 @@ static u32 crc32c_loongarch_hw(u32 crc_, const u8 *p, unsigned int len)CRC32C (crc, value, w); p +=sizeof (u32); - len -=sizeof (u32); }if (len &sizeof (u16)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 201/399 wireguard: netlink: check for dangling peer via is_dead instead of empty list
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
[ Upstream commit 55b6c738673871c9b0edae05d0c97995c1ff08c4 ]
If all peers are removed via wg_peer_remove_all(), rather than setting peer_list to empty, the peer is added to a temporary list with a head on the stack of wg_peer_remove_all(). If a netlink dump is resumed and the cursored peer is one that has been removed via wg_peer_remove_all(), it will iterate from that peer and then attempt to dump freed peers.
Fix this by instead checking peer->is_dead, which was explictly created for this purpose. Also move up the device_update_lock lockdep assertion, since reading is_dead relies on that.
It can be reproduced by a small script like:
echo "Setting config..."
ip link add dev wg0 type wireguard
wg setconf wg0 /big-config
(
while true; do
echo "Showing config..."
wg showconf wg0 > /dev/null
done
) &
sleep 4
wg setconf wg0 <(printf "[Peer]\nPublicKey=$(wg genkey)\n")
Resulting in:
BUG: KASAN: slab-use-after-free in __lock_acquire+0x182a/0x1b20
Read of size 8 at addr ffff88811956ec70 by task wg/59
CPU: 2 PID: 59 Comm: wg Not tainted 6.8.0-rc2-debug+ #5
Call Trace:
<TASK>
dump_stack_lvl+0x47/0x70
print_address_description.constprop.0+0x2c/0x380
print_report+0xab/0x250
kasan_report+0xba/0xf0
__lock_acquire+0x182a/0x1b20
lock_acquire+0x191/0x4b0
down_read+0x80/0x440
get_peer+0x140/0xcb0
wg_get_device_dump+0x471/0x1130--- drivers/net/wireguard/netlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireguard/netlink.c +3 -3
@@ -255,17 +255,17 @@ static int wg_get_device_dump(struct sk_buff *skb, struct netlink_callback *cb)if (!peers_nest) goto out; ret =0 ; -/* If the last cursor was removed via list_del_init in peer_remove, then +lockdep_assert_held (&wg->device_update_lock); +/* If the last cursor was removed in peer_remove or peer_remove_all, then * we just treat this the same as there being no more peers left. The * reason is that seq_nr should indicate to userspace that this isn't a * coherent dump anyway, so they'll try again. */ if (list_empty (&wg->peer_list) || - (ctx->next_peer &&list_empty (&ctx->next_peer->peer_list))) { + (ctx->next_peer && ctx->next_peer->is_dead)) {nla_nest_cancel (skb, peers_nest); goto out; } -lockdep_assert_held (&wg->device_update_lock); peer =list_prepare_entry (ctx->next_peer, &wg->peer_list, peer_list);list_for_each_entry_continue (peer, &wg->peer_list, peer_list) {if (get_peer (peer, skb, ctx)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 202/399 wireguard: netlink: access device through ctx instead of peer
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
[ Upstream commit 71cbd32e3db82ea4a74e3ef9aeeaa6971969c86f ]
The previous commit fixed a bug that led to a NULL peer->device being dereferenced. It's actually easier and faster performance-wise to instead get the device from ctx->wg. This semantically makes more sense too, since ctx->wg->peer_allowedips.seq is compared with ctx->allowedips_seq, basing them both in ctx. This also acts as a defence in depth provision against freed peers.
--- drivers/net/wireguard/netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireguard/netlink.c +2 -2
@@ -164,8 +164,8 @@ get_peer(struct wg_peer *peer, struct sk_buff *skb, struct dump_ctx *ctx)if (!allowedips_node) goto no_allowedips;if (!ctx->allowedips_seq) - ctx->allowedips_seq = peer->device->peer_allowedips.seq; -else if (ctx->allowedips_seq != peer->device->peer_allowedips.seq) + ctx->allowedips_seq = ctx->wg->peer_allowedips.seq; +else if (ctx->allowedips_seq != ctx->wg->peer_allowedips.seq) goto no_allowedips; allowedips_nest =nla_nest_start (skb,WGPEER_A_ALLOWEDIPS );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 203/399 wireguard: selftests: set RISCV_ISA_FALLBACK on riscv{32,64}
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
[ Upstream commit e995f5dd9a9cef818af32ec60fc38d68614afd12 ]
This option is needed to continue booting with QEMU. Recent changes that made this optional meant that it gets unset in the test harness, and so WireGuard CI has been broken. Fix this by simply setting this option.
--- tools/testing/selftests/wireguard/qemu/arch/riscv32.config | 1 + tools/testing/selftests/wireguard/qemu/arch/riscv64.config | 1 + 2 files changed, 2 insertions(+)
tools/testing/selftests/wireguard/qemu/arch/riscv32.config +1 -0
@@ -3,6 +3,7 @@ CONFIG_ARCH_RV32I=y CONFIG_MMU=y CONFIG_FPU=y CONFIG_SOC_VIRT=y +CONFIG_RISCV_ISA_FALLBACK=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y
tools/testing/selftests/wireguard/qemu/arch/riscv64.config +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARCH_RV64I=y CONFIG_MMU=y CONFIG_FPU=y CONFIG_SOC_VIRT=y +CONFIG_RISCV_ISA_FALLBACK=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 204/399 ahci: asm1064: asm1166: dont limit reported ports
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Conrad Kostecki <[email protected]>
[ Upstream commit 6cd8adc3e18960f6e59d797285ed34ef473cc896 ]
Previously, patches have been added to limit the reported count of SATA ports for asm1064 and asm1166 SATA controllers, as those controllers do report more ports than physically having.
While it is allowed to report more ports than physically having in CAP.NP, it is not allowed to report more ports than physically having in the PI (Ports Implemented) register, which is what these HBAs do. (This is a AHCI spec violation.)
Unfortunately, it seems that the PMP implementation in these ASMedia HBAs is also violating the AHCI and SATA-IO PMP specification.
What these HBAs do is that they do not report that they support PMP (CAP.SPM (Supports Port Multiplier) is not set).
Instead, they have decided to add extra "virtual" ports in the PI register that is used if a port multiplier is connected to any of the physical ports of the HBA.
Enumerating the devices behind the PMP as specified in the AHCI and SATA-IO specifications, by using PMP READ and PMP WRITE commands to the physical ports of the HBA is not possible, you have to use the "virtual" ports.
This is of course bad, because this gives us no way to detect the device and vendor ID of the PMP actually connected to the HBA, which means that we can not apply the proper PMP quirks for the PMP that is connected to the HBA.
Limiting the port map will thus stop these controllers from working with SATA Port Multipliers.
This patch reverts both patches for asm1064 and asm1166, so old behavior is restored and SATA PMP will work again, but it will also reintroduce the (minutes long) extra boot time for the ASMedia controllers that do not have a PMP connected (either on the PCIe card itself, or an external PMP).
However, a longer boot time for some, is the lesser evil compared to some other users not being able to detect their drives at all.
--- drivers/ata/ahci.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/ata/ahci.c +0 -13
@@ -671,19 +671,6 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");static void ahci_pci_save_initial_config (struct pci_dev *pdev,struct ahci_host_priv *hpriv) { -if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA ) { -switch (pdev->device) { -case 0x1166 : -dev_info (&pdev->dev,"ASM1166 has only six ports\n" ); - hpriv->saved_port_map =0x3f ; -break ; -case 0x1064 : -dev_info (&pdev->dev,"ASM1064 has only four ports\n" ); - hpriv->saved_port_map =0xf ; -break ; - } - } -if (pdev->vendor ==PCI_VENDOR_ID_JMICRON && pdev->device ==0x2361 ) {dev_info (&pdev->dev,"JMB361 has only one port\n" ); hpriv->saved_port_map =1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 205/399 drm/amd/display: Change default size for dummy plane in DML2
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Swapnil Patel <[email protected]>
[ Upstream commit 75eb8f7df65c5e6eb22a5aff8deb60ce0b65de1a ]
[WHY & HOW]
Currently, to map dc states into dml_display_cfg,
We create a dummy plane if the stream doesn't have any planes attached to it. This dummy plane uses max addersable width height. This results in certain mode validations failing when they shouldn't.
--- .../display/dc/dml2/dml2_translation_helper.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +15 -3
@@ -824,13 +824,25 @@ static struct scaler_data get_scaler_data_for_plane(const struct dc_plane_statestatic void populate_dummy_dml_plane_cfg (struct dml_plane_cfg_st *out,unsigned int location,const struct dc_stream_state *in) { +dml_uint_t width, height; + +if (in->timing.h_addressable >3840 ) + width =3840 ; +else + width = in->timing.h_addressable;// 4K max + +if (in->timing.v_addressable >2160 ) + height =2160 ; +else + height = in->timing.v_addressable;// 4K max + out->CursorBPP[location] = dml_cur_32bit; out->CursorWidth[location] =256 ; out->GPUVMMinPageSizeKBytes[location] =256 ; - out->ViewportWidth[location] = in->timing.h_addressable; - out->ViewportHeight[location] = in->timing.v_addressable; + out->ViewportWidth[location] = width; + out->ViewportHeight[location] = height; out->ViewportStationary[location] = false; out->ViewportWidthChroma[location] =0 ; out->ViewportHeightChroma[location] =0 ;
@@ -849,7 +861,7 @@ static void populate_dummy_dml_plane_cfg(struct dml_plane_cfg_st *out, unsigned out->HTapsChroma[location] =0 ; out->VTapsChroma[location] =0 ; out->SourceScan[location] = dml_rotation_0; - out->ScalerRecoutWidth[location] = in->timing.h_addressable; + out->ScalerRecoutWidth[location] = width; out->LBBitPerPixel[location] =57 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 206/399 drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philip Yang <[email protected]>
[ Upstream commit 6c6064cbe58b43533e3451ad6a8ba9736c109ac3 ]
Otherwise after the GTT bo is released, the GTT and gart space is freed but amdgpu_ttm_backend_unbind will not clear the gart page table entry and leave valid mapping entry pointing to the stale system page. Then if GPU access the gart address mistakely, it will read undefined value instead page fault, harder to debug and reproduce the real issue.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -0
@@ -869,6 +869,7 @@ static void amdgpu_ttm_gart_bind(struct amdgpu_device *adev,amdgpu_gart_bind (adev, gtt->offset, ttm->num_pages, gtt->ttm.dma_address, flags); } + gtt->bound = true; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 207/399 drm/amdgpu/pm: Fix NULL pointer dereference when get power limit
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Jun <[email protected]>
[ Upstream commit 08ae9ef829b8055c2fdc8cfee37510c1f4721a07 ]
Because powerplay_table initialization is skipped under sriov case, We check and set default lower and upper OD value if powerplay_table is NULL.
--- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 14 ++++++++------ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 16 +++++++++------- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 14 ++++++++------ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 14 ++++++++------ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 14 ++++++++------ 5 files changed, 41 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +8 -6
@@ -1286,7 +1286,7 @@ static int arcturus_get_power_limit(struct smu_context *smu,struct smu_11_0_powerplay_table *powerplay_table = (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table;PPTable_t *pptable = smu->smu_table.driver_pptable; -uint32_t power_limit, od_percent_upper, od_percent_lower; +uint32_t power_limit, od_percent_upper =0 , od_percent_lower =0 ;if (smu_v11_0_get_current_power_limit (smu, &power_limit)) {/* the last hope to figure out the ppt limit */
@@ -1303,12 +1303,14 @@ static int arcturus_get_power_limit(struct smu_context *smu,if (default_power_limit) *default_power_limit = power_limit; -if (smu->od_enabled) - od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); -else - od_percent_upper =0 ; +if (powerplay_table) { +if (smu->od_enabled) + od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); +else + od_percent_upper =0 ; - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + }dev_dbg (smu->adev->dev,"od percent upper:%d, od percent lower:%d (default power: %d)\n" , od_percent_upper, od_percent_lower, power_limit);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +9 -7
@@ -2339,7 +2339,7 @@ static int navi10_get_power_limit(struct smu_context *smu, (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table;struct smu_11_0_overdrive_table *od_settings = smu->od_settings;PPTable_t *pptable = smu->smu_table.driver_pptable; -uint32_t power_limit, od_percent_upper, od_percent_lower; +uint32_t power_limit, od_percent_upper =0 , od_percent_lower =0 ;if (smu_v11_0_get_current_power_limit (smu, &power_limit)) {/* the last hope to figure out the ppt limit */
@@ -2356,13 +2356,15 @@ static int navi10_get_power_limit(struct smu_context *smu,if (default_power_limit) *default_power_limit = power_limit; -if (smu->od_enabled && -navi10_od_feature_is_supported (od_settings,SMU_11_0_ODCAP_POWER_LIMIT )) - od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); -else - od_percent_upper =0 ; +if (powerplay_table) { +if (smu->od_enabled && +navi10_od_feature_is_supported (od_settings,SMU_11_0_ODCAP_POWER_LIMIT )) + od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); +else + od_percent_upper =0 ; - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + }dev_dbg (smu->adev->dev,"od percent upper:%d, od percent lower:%d (default power: %d)\n" , od_percent_upper, od_percent_lower, power_limit);
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +8 -6
@@ -625,7 +625,7 @@ static int sienna_cichlid_get_power_limit(struct smu_context *smu, {struct smu_11_0_7_powerplay_table *powerplay_table = (struct smu_11_0_7_powerplay_table *)smu->smu_table.power_play_table; -uint32_t power_limit, od_percent_upper, od_percent_lower; +uint32_t power_limit, od_percent_upper =0 , od_percent_lower =0 ;uint16_t *table_member;GET_PPTABLE_MEMBER (SocketPowerLimitAc, &table_member);
@@ -640,12 +640,14 @@ static int sienna_cichlid_get_power_limit(struct smu_context *smu,if (default_power_limit) *default_power_limit = power_limit; -if (smu->od_enabled) - od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); -else - od_percent_upper =0 ; +if (powerplay_table) { +if (smu->od_enabled) + od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); +else + od_percent_upper =0 ; - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); + }dev_dbg (smu->adev->dev,"od percent upper:%d, od percent lower:%d (default power: %d)\n" , od_percent_upper, od_percent_lower, power_limit);
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +8 -6
@@ -2356,7 +2356,7 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu, (struct smu_13_0_0_powerplay_table *)table_context->power_play_table;PPTable_t *pptable = table_context->driver_pptable;SkuTable_t *skutable = &pptable->SkuTable; -uint32_t power_limit, od_percent_upper, od_percent_lower; +uint32_t power_limit, od_percent_upper =0 , od_percent_lower =0 ;uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0 ][POWER_SOURCE_AC ];if (smu_v13_0_get_current_power_limit (smu, &power_limit))
@@ -2369,12 +2369,14 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu,if (default_power_limit) *default_power_limit = power_limit; -if (smu->od_enabled) - od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); -else - od_percent_upper =0 ; +if (powerplay_table) { +if (smu->od_enabled) + od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); +else + od_percent_upper =0 ; - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); + }dev_dbg (smu->adev->dev,"od percent upper:%d, od percent lower:%d (default power: %d)\n" , od_percent_upper, od_percent_lower, power_limit);
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +8 -6
@@ -2320,7 +2320,7 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu, (struct smu_13_0_7_powerplay_table *)table_context->power_play_table;PPTable_t *pptable = table_context->driver_pptable;SkuTable_t *skutable = &pptable->SkuTable; -uint32_t power_limit, od_percent_upper, od_percent_lower; +uint32_t power_limit, od_percent_upper =0 , od_percent_lower =0 ;uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0 ][POWER_SOURCE_AC ];if (smu_v13_0_get_current_power_limit (smu, &power_limit))
@@ -2333,12 +2333,14 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu,if (default_power_limit) *default_power_limit = power_limit; -if (smu->od_enabled) - od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); -else - od_percent_upper =0 ; +if (powerplay_table) { +if (smu->od_enabled) + od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); +else + od_percent_upper =0 ; - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); + }dev_dbg (smu->adev->dev,"od percent upper:%d, od percent lower:%d (default power: %d)\n" , od_percent_upper, od_percent_lower, power_limit);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 208/399 drm/amdgpu/pm: Check the validity of overdiver power limit
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Jun <[email protected]>
[ Upstream commit e17718251addb31e1771fd28735ec410e6ca650a ]
Check the validity of overdriver power limit before using it.
--- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 11 +++++---- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 ++++---- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 23 +++++++++++-------- .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 10 ++++---- .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 10 ++++---- 5 files changed, 37 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +7 -4
@@ -1285,6 +1285,7 @@ static int arcturus_get_power_limit(struct smu_context *smu, {struct smu_11_0_powerplay_table *powerplay_table = (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table; +struct smu_11_0_overdrive_table *od_settings = smu->od_settings;PPTable_t *pptable = smu->smu_table.driver_pptable;uint32_t power_limit, od_percent_upper =0 , od_percent_lower =0 ;
@@ -1304,12 +1305,14 @@ static int arcturus_get_power_limit(struct smu_context *smu, *default_power_limit = power_limit;if (powerplay_table) { -if (smu->od_enabled) +if (smu->od_enabled && + od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT ]) { od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); -else + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + }else if (od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT ]) { od_percent_upper =0 ; - - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + } } dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5 -4
@@ -2358,12 +2358,13 @@ static int navi10_get_power_limit(struct smu_context *smu,if (powerplay_table) {if (smu->od_enabled && -navi10_od_feature_is_supported (od_settings,SMU_11_0_ODCAP_POWER_LIMIT )) +navi10_od_feature_is_supported (od_settings,SMU_11_0_ODCAP_POWER_LIMIT )) { od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); -else + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + }else if (navi10_od_feature_is_supported (od_settings,SMU_11_0_ODCAP_POWER_LIMIT )) { od_percent_upper =0 ; - - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE ]); + } } dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +13 -10
@@ -617,6 +617,12 @@ static uint32_t sienna_cichlid_get_throttler_status_locked(struct smu_context *sreturn throttler_status; } +static bool sienna_cichlid_is_od_feature_supported (struct smu_11_0_7_overdrive_table *od_table, +enum SMU_11_0_7_ODFEATURE_CAP cap) +{ +return od_table->cap[cap]; +} + static int sienna_cichlid_get_power_limit(struct smu_context *smu, uint32_t *current_power_limit, uint32_t *default_power_limit,
@@ -625,6 +631,7 @@ static int sienna_cichlid_get_power_limit(struct smu_context *smu, {struct smu_11_0_7_powerplay_table *powerplay_table = (struct smu_11_0_7_powerplay_table *)smu->smu_table.power_play_table; +struct smu_11_0_7_overdrive_table *od_settings = smu->od_settings;uint32_t power_limit, od_percent_upper =0 , od_percent_lower =0 ;uint16_t *table_member;
@@ -641,12 +648,14 @@ static int sienna_cichlid_get_power_limit(struct smu_context *smu, *default_power_limit = power_limit;if (powerplay_table) { -if (smu->od_enabled) +if (smu->od_enabled && +sienna_cichlid_is_od_feature_supported (od_settings,SMU_11_0_7_ODCAP_POWER_LIMIT )) { od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); -else + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); + }else if ((sienna_cichlid_is_od_feature_supported (od_settings,SMU_11_0_7_ODCAP_POWER_LIMIT ))) { od_percent_upper =0 ; - - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE ]); + } } dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
@@ -1252,12 +1261,6 @@ static bool sienna_cichlid_is_support_fine_grained_dpm(struct smu_context *smu,return dpm_desc->SnapToDiscrete ==0 ; } -static bool sienna_cichlid_is_od_feature_supported (struct smu_11_0_7_overdrive_table *od_table, -enum SMU_11_0_7_ODFEATURE_CAP cap) -{ -return od_table->cap[cap]; -} -static void sienna_cichlid_get_od_setting_range (struct smu_11_0_7_overdrive_table *od_table,enum SMU_11_0_7_ODSETTING_ID setting,uint32_t *min,uint32_t *max)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +6 -4
@@ -2370,12 +2370,14 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu, *default_power_limit = power_limit;if (powerplay_table) { -if (smu->od_enabled) +if (smu->od_enabled && +smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_PPT_BIT )) { od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); -else + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); + }else if (smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_PPT_BIT )) { od_percent_upper =0 ; - - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE ]); + } } dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +6 -4
@@ -2334,12 +2334,14 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu, *default_power_limit = power_limit;if (powerplay_table) { -if (smu->od_enabled) +if (smu->od_enabled && + (smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_PPT_BIT ))) { od_percent_upper =le32_to_cpu (powerplay_table->overdrive_table.max[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); -else + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); + }else if (smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_PPT_BIT )) { od_percent_upper =0 ; - - od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); + od_percent_lower =le32_to_cpu (powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE ]); + } } dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 209/399 drm/amd/display: Override min required DCFCLK in dml1_validate
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sohaib Nadeem <[email protected]>
[ Upstream commit 26fbcb3da77efc77bd7327b7916338d773cca484 ]
[WHY]:
Increasing min DCFCLK addresses underflow issues that occur when phantom pipe is turned on for some Sub-Viewport configs
[HOW]:dcn32_override_min_req_dcfclk is added to override DCFCLK value in dml1_validate when subviewport is being used.
--- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c | 6 ++++++ .../gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 1 + .../gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.h | 3 +++ 3 files changed, 10 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c +6 -0
@@ -782,3 +782,9 @@ void dcn32_update_dml_pipes_odm_policy_based_on_context(struct dc *dc, struct dc pipe_cnt++; } } + +void dcn32_override_min_req_dcfclk (struct dc *dc,struct dc_state *context) +{ +if (dcn32_subvp_in_use (dc, context) && context->bw_ctx.bw.dcn.clk.dcfclk_khz <=MIN_SUBVP_DCFCLK_KHZ ) + context->bw_ctx.bw.dcn.clk.dcfclk_khz =MIN_SUBVP_DCFCLK_KHZ ; +}
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +1 -0
@@ -1771,6 +1771,7 @@ static bool dml1_validate(struct dc *dc, struct dc_state *context, bool fast_val dc->res_pool->funcs->calculate_wm_and_dlg (dc, context, pipes, pipe_cnt, vlevel);dcn32_override_min_req_memclk (dc, context); +dcn32_override_min_req_dcfclk (dc, context);BW_VAL_TRACE_END_WATERMARKS ();
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.h +3 -0
@@ -42,6 +42,7 @@#define SUBVP_ACTIVE_MARGIN_LIST_LEN 2#define DCN3_2_MAX_SUBVP_PIXEL_RATE_MHZ 1800#define DCN3_2_VMIN_DISPCLK_HZ 717000000 +#define MIN_SUBVP_DCFCLK_KHZ 400000#define TO_DCN32_RES_POOL (pool)\ container_of(pool, struct dcn32_resource_pool, base)
@@ -181,6 +182,8 @@ bool dcn32_subvp_vblank_admissable(struct dc *dc, struct dc_state *context, intvoid dcn32_update_dml_pipes_odm_policy_based_on_context (struct dc *dc,struct dc_state *context,display_e2e_pipe_params_st *pipes); +void dcn32_override_min_req_dcfclk (struct dc *dc,struct dc_state *context); +/* definitions for run time init of reg offsets */ /* CLK SRC */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 210/399 drm/amd/display: Allow dirty rects to be sent to dmub when abm is active
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josip Pavic <[email protected]>
[ Upstream commit 7fb19d9510937121a1f285894cffd30bc96572e3 ]
[WHY]
It's beneficial for ABM to know when new frame data are available.
[HOW]
Add new condition to allow dirty rects to be sent to DMUB when ABM is active. ABM will use this as a signal that a new frame has arrived.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -0
@@ -3223,6 +3223,9 @@ static bool dc_dmub_should_send_dirty_rect_cmd(struct dc *dc, struct dc_stream_sif (stream->link->replay_settings.config.replay_supported)return true; +if (stream->ctx->dce_version >=DCN_VERSION_3_5 && stream->abm_level) +return true; +return false; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 211/399 drm/amd/display: Init DPPCLK from SMU on dcn32
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dillon Varone <[email protected]>
[ Upstream commit 4f5b8d78ca43fcc695ba16c83ebfabbfe09506d6 ]
[WHY & HOW]
DPPCLK ranges should be obtained from the SMU when available.
--- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 14 ++++++++++ .../drm/amd/display/dc/dml2/dml2_wrapper.c | 28 +++++++++++++------ .../drm/amd/display/dc/dml2/dml2_wrapper.h | 3 ++ .../dc/resource/dcn32/dcn32_resource.c | 2 ++ .../dc/resource/dcn321/dcn321_resource.c | 2 ++ 5 files changed, 41 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +14 -0
@@ -216,6 +216,16 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base)if (clk_mgr_base->bw_params->dc_mode_limit.dispclk_mhz >1950 ) clk_mgr_base->bw_params->dc_mode_limit.dispclk_mhz =1950 ; +/* DPPCLK */ +dcn32_init_single_clock (clk_mgr,PPCLK_DPPCLK , + &clk_mgr_base->bw_params->clk_table.entries[0 ].dppclk_mhz, + &num_entries_per_clk->num_dppclk_levels); + num_levels = num_entries_per_clk->num_dppclk_levels; + clk_mgr_base->bw_params->dc_mode_limit.dppclk_mhz =dcn30_smu_get_dc_mode_max_dpm_freq (clk_mgr,PPCLK_DPPCLK ); +//HW recommends limit of 1950 MHz in display clock for all DCN3.2.x +if (clk_mgr_base->bw_params->dc_mode_limit.dppclk_mhz >1950 ) + clk_mgr_base->bw_params->dc_mode_limit.dppclk_mhz =1950 ; +if (num_entries_per_clk->num_dcfclk_levels && num_entries_per_clk->num_dtbclk_levels && num_entries_per_clk->num_dispclk_levels)
@@ -240,6 +250,10 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base) = khz_to_mhz_ceil(clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz); } +for (i =0 ; i < num_levels; i++) +if (clk_mgr_base->bw_params->clk_table.entries[i].dppclk_mhz >1950 ) + clk_mgr_base->bw_params->clk_table.entries[i].dppclk_mhz =1950 ; +/* Get UCLK, update bounding box */ clk_mgr_base->funcs->get_memclk_states_from_smu (clk_mgr_base);
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c +20 -8
@@ -703,13 +703,8 @@ static inline struct dml2_context *dml2_allocate_memory(void)return (struct dml2_context *)kzalloc (sizeof (struct dml2_context ),GFP_KERNEL ); } -bool dml2_create (const struct dc *in_dc,const struct dml2_configuration_options *config,struct dml2_context **dml2) +static void dml2_init (const struct dc *in_dc,const struct dml2_configuration_options *config,struct dml2_context **dml2) { -// Allocate Mode Lib Ctx - *dml2 =dml2_allocate_memory (); - -if (!(*dml2)) -return false;// Store config options (*dml2)->config = *config;
@@ -737,9 +732,18 @@ bool dml2_create(const struct dc *in_dc, const struct dml2_configuration_optionsinitialize_dml2_soc_bbox (*dml2, in_dc, &(*dml2)->v20.dml_core_ctx.soc);initialize_dml2_soc_states (*dml2, in_dc, &(*dml2)->v20.dml_core_ctx.soc, &(*dml2)->v20.dml_core_ctx.states); +} + +bool dml2_create (const struct dc *in_dc,const struct dml2_configuration_options *config,struct dml2_context **dml2) +{ +// Allocate Mode Lib Ctx + *dml2 =dml2_allocate_memory (); + +if (!(*dml2)) +return false; + +dml2_init (in_dc, config, dml2); -/*Initialize DML20 instance which calls dml2_core_create, and core_dcn3_populate_informative*/ -//dml2_initialize_instance(&(*dml_ctx)->v20.dml_init); return true; }
@@ -779,3 +783,11 @@ bool dml2_create_copy(struct dml2_context **dst_dml2,return true; } + +void dml2_reinit (const struct dc *in_dc, +const struct dml2_configuration_options *config, +struct dml2_context **dml2) +{ + +dml2_init (in_dc, config, dml2); +}
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h +3 -0
@@ -214,6 +214,9 @@ void dml2_copy(struct dml2_context *dst_dml2, struct dml2_context *src_dml2);bool dml2_create_copy (struct dml2_context **dst_dml2,struct dml2_context *src_dml2); +void dml2_reinit (const struct dc *in_dc, +const struct dml2_configuration_options *config, +struct dml2_context **dml2);/* * dml2_validate - Determines if a display configuration is supported or not.
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +2 -0
@@ -1931,6 +1931,8 @@ static void dcn32_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw {DC_FP_START ();dcn32_update_bw_bounding_box_fpu (dc, bw_params); +if (dc->debug.using_dml2 && dc->current_state && dc->current_state->bw_ctx.dml2) +dml2_reinit (dc, &dc->dml2_options, &dc->current_state->bw_ctx.dml2);DC_FP_END (); }
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c +2 -0
@@ -1581,6 +1581,8 @@ static void dcn321_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *b {DC_FP_START ();dcn321_update_bw_bounding_box_fpu (dc, bw_params); +if (dc->debug.using_dml2 && dc->current_state && dc->current_state->bw_ctx.dml2) +dml2_reinit (dc, &dc->dml2_options, &dc->current_state->bw_ctx.dml2);DC_FP_END (); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 212/399 drm/amd/display: Update odm when ODM combine is changed on an otg master pipe with no plane
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenjing Liu <[email protected]>
[ Upstream commit 86e9523fb0efce27095d3086473c739cce720d01 ]
[WHY]
When committing an update with ODM combine change when the plane is removing or already removed, we fail to detect odm change in pipe update flags. This has caused mismatch between new dc state and the actual hardware state, because we missed odm programming.
[HOW]
- Detect odm change even for otg master pipe without a plane.
- Update odm config before calling program pipes for pipe with planes.
The commit also updates blank pattern programming when odm is changed without plane. This is because number of OPP is changed when ODM combine is changed. Blank pattern is per OPP so we will need to reprogram OPP based on the new pipe topology.
--- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 41 ++++++++++--------- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 7 ++++ 2 files changed, 28 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +21 -20
@@ -1392,6 +1392,11 @@ static void dcn20_detect_pipe_changes(struct dc_state *old_state,return ; } +if (resource_is_pipe_type (new_pipe,OTG_MASTER ) && +resource_is_odm_topology_changed (new_pipe, old_pipe)) +/* Detect odm changes */ + new_pipe->update_flags.bits.odm =1 ; +/* Exit on unchanged, unused pipe */ if (!old_pipe->plane_state && !new_pipe->plane_state)return ;
@@ -1445,10 +1450,6 @@ static void dcn20_detect_pipe_changes(struct dc_state *old_state,/* Detect top pipe only changes */ if (resource_is_pipe_type (new_pipe,OTG_MASTER )) { -/* Detect odm changes */ -if (resource_is_odm_topology_changed (new_pipe, old_pipe)) - new_pipe->update_flags.bits.odm =1 ; -/* Detect global sync changes */ if (old_pipe->pipe_dlg_param.vready_offset != new_pipe->pipe_dlg_param.vready_offset || old_pipe->pipe_dlg_param.vstartup_start != new_pipe->pipe_dlg_param.vstartup_start
@@ -1891,19 +1892,20 @@ void dcn20_program_front_end_for_ctx(DC_LOGGER_INIT (dc->ctx->logger);unsigned int prev_hubp_count =0 ;unsigned int hubp_count =0 ; +struct pipe_ctx *pipe;if (resource_is_pipe_topology_changed (dc->current_state, context))resource_log_pipe_topology_update (dc, context);if (dc->hwss.program_triplebuffer !=NULL && dc->debug.enable_tri_buf) {for (i =0 ; i < dc->res_pool->pipe_count; i++) { -struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; + pipe = &context->res_ctx.pipe_ctx[i]; -if (!pipe_ctx->top_pipe && !pipe_ctx->prev_odm_pipe && pipe_ctx->plane_state) { -ASSERT (!pipe_ctx->plane_state->triplebuffer_flips); +if (!pipe->top_pipe && !pipe->prev_odm_pipe && pipe->plane_state) { +ASSERT (!pipe->plane_state->triplebuffer_flips);/*turn off triple buffer for full update*/ dc->hwss.program_triplebuffer ( - dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips); + dc, pipe, pipe->plane_state->triplebuffer_flips); } } }
@@ -1978,12 +1980,22 @@ void dcn20_program_front_end_for_ctx(DC_LOG_DC ("Reset mpcc for pipe %d\n" , dc->current_state->res_ctx.pipe_ctx[i].pipe_idx); } +/* update ODM for blanked OTG master pipes */ +for (i =0 ; i < dc->res_pool->pipe_count; i++) { + pipe = &context->res_ctx.pipe_ctx[i]; +if (resource_is_pipe_type (pipe,OTG_MASTER ) && + !resource_is_pipe_type (pipe,DPP_PIPE ) && + pipe->update_flags.bits.odm && + hws->funcs.update_odm) + hws->funcs.update_odm (dc, context, pipe); + } +/* * Program all updated pipes, order matters for mpcc setup. Start with * top pipe and program all pipes that follow in order */ for (i =0 ; i < dc->res_pool->pipe_count; i++) { -struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i]; + pipe = &context->res_ctx.pipe_ctx[i];if (pipe->plane_state && !pipe->top_pipe) {while (pipe) {
@@ -2022,17 +2034,6 @@ void dcn20_program_front_end_for_ctx( context->stream_status[0].plane_count > 1) { pipe->plane_res.hubp->funcs->hubp_wait_pipe_read_start (pipe->plane_res.hubp); } - -/* when dynamic ODM is active, pipes must be reconfigured when all planes are -* disabled, as some transitions will leave software and hardware state -* mismatched. -*/ -if (dc->debug.enable_single_display_2to1_odm_policy && - pipe->stream && - pipe->update_flags.bits.disable && - !pipe->prev_odm_pipe && - hws->funcs.update_odm) - hws->funcs.update_odm (dc, context, pipe); } }
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c +7 -0
@@ -1156,6 +1156,13 @@ void dcn32_update_odm(struct dc *dc, struct dc_state *context, struct pipe_ctx * dsc->funcs->dsc_disconnect (dsc); } } + +if (!resource_is_pipe_type (pipe_ctx,DPP_PIPE )) +/* +* blank pattern is generated by OPP, reprogram blank pattern +* due to OPP count change +*/ + dc->hwseq->funcs.blank_pixel_data (dc, pipe_ctx, true); }unsigned int dcn32_calculate_dccg_k1_k2_values (struct pipe_ctx *pipe_ctx,unsigned int *k1_div,unsigned int *k2_div)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 213/399 drm/amd/display: Fix idle check for shared firmware state
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 3d066f9547dd58329b526db44f42c487a7974703 ]
[WHY]
We still had an instance of get_idle_state checking the PMFW scratch register instead of the actual idle allow signal.
[HOW]
Replace it with the SW state check for whether we had allowed idle through notify_idle.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -9
@@ -4834,22 +4834,16 @@ void dc_allow_idle_optimizations(struct dc *dc, bool allow)bool dc_dmub_is_ips_idle_state (struct dc *dc) { -uint32_t idle_state =0 ; -if (dc->debug.disable_idle_power_optimizations)return false;if (!dc->caps.ips_support || (dc->config.disable_ips ==DMUB_IPS_DISABLE_ALL ))return false; -if (dc->hwss.get_idle_state) - idle_state = dc->hwss.get_idle_state (dc); - -if (!(idle_state &DMUB_IPS1_ALLOW_MASK ) || - !(idle_state &DMUB_IPS2_ALLOW_MASK )) -return true; +if (!dc->ctx->dmub_srv) +return false; -return false; +return dc->ctx->dmub_srv->idle_allowed; }/* set min and max memory clock to lowest and highest DPM level, respectively */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 214/399 drm/amd/display: Amend coasting vtotal for replay low hz
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: ChunTao Tso <[email protected]>
[ Upstream commit 8e054b0f1e71531762b8ded7f66c1b4af734671b ]
[WHY]
The original coasting vtotal is 2 bytes, and it need to be amended to 4 bytes because low hz case.
[HOW]
Amend coasting vtotal from 2 bytes to 4 bytes.
--- drivers/gpu/drm/amd/display/dc/dc_types.h | 4 ++-- drivers/gpu/drm/amd/display/dc/inc/link.h | 4 ++-- .../display/dc/link/protocols/link_edp_panel_control.c | 4 ++-- .../display/dc/link/protocols/link_edp_panel_control.h | 4 ++-- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 ++++++++ drivers/gpu/drm/amd/display/modules/power/power_helpers.c | 2 +- drivers/gpu/drm/amd/display/modules/power/power_helpers.h | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_types.h +2 -2
@@ -1085,9 +1085,9 @@ struct replay_settings {/* SMU optimization is enabled */ bool replay_smu_opt_enable;/* Current Coasting vtotal */ -uint16_t coasting_vtotal; +uint32_t coasting_vtotal;/* Coasting vtotal table */ -uint16_t coasting_vtotal_table[PR_COASTING_TYPE_NUM ]; +uint32_t coasting_vtotal_table[PR_COASTING_TYPE_NUM ];/* Maximum link off frame count */ enum replay_link_off_frame_count_level link_off_frame_count_level;/* Replay pseudo vtotal for abm + ips on full screen video which can improve ips residency */
drivers/gpu/drm/amd/display/dc/inc/link.h +2 -2
@@ -285,12 +285,12 @@ struct link_service {enum replay_FW_Message_type msg, union dmub_replay_cmd_set *cmd_data);bool (*edp_set_coasting_vtotal)( -struct dc_link *link,uint16_t coasting_vtotal); +struct dc_link *link,uint32_t coasting_vtotal);bool (*edp_replay_residency)(const struct dc_link *link,unsigned int *residency,const bool is_start,const bool is_alpm);bool (*edp_set_replay_power_opt_and_coasting_vtotal)(struct dc_link *link, -const unsigned int *power_opts,uint16_t coasting_vtotal); +const unsigned int *power_opts,uint32_t coasting_vtotal);bool (*edp_wait_for_t12)(struct dc_link *link); bool (*edp_is_ilr_optimization_required)(struct dc_link *link,
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +2 -2
@@ -1034,7 +1034,7 @@ bool edp_send_replay_cmd(struct dc_link *link,return true; } -bool edp_set_coasting_vtotal (struct dc_link *link,uint16_t coasting_vtotal) +bool edp_set_coasting_vtotal (struct dc_link *link,uint32_t coasting_vtotal) {struct dc *dc = link->ctx->dc;struct dmub_replay *replay = dc->res_pool->replay;
@@ -1073,7 +1073,7 @@ bool edp_replay_residency(const struct dc_link *link, }bool edp_set_replay_power_opt_and_coasting_vtotal (struct dc_link *link, -const unsigned int *power_opts,uint16_t coasting_vtotal) +const unsigned int *power_opts,uint32_t coasting_vtotal) {struct dc *dc = link->ctx->dc;struct dmub_replay *replay = dc->res_pool->replay;
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h +2 -2
@@ -59,12 +59,12 @@ bool edp_setup_replay(struct dc_link *link,bool edp_send_replay_cmd (struct dc_link *link,enum replay_FW_Message_type msg,union dmub_replay_cmd_set *cmd_data); -bool edp_set_coasting_vtotal (struct dc_link *link,uint16_t coasting_vtotal); +bool edp_set_coasting_vtotal (struct dc_link *link,uint32_t coasting_vtotal);bool edp_replay_residency (const struct dc_link *link,unsigned int *residency,const bool is_start,const bool is_alpm);bool edp_get_replay_state (const struct dc_link *link,uint64_t *state);bool edp_set_replay_power_opt_and_coasting_vtotal (struct dc_link *link, -const unsigned int *power_opts,uint16_t coasting_vtotal); +const unsigned int *power_opts,uint32_t coasting_vtotal);bool edp_wait_for_t12 (struct dc_link *link);bool edp_is_ilr_optimization_required (struct dc_link *link,struct dc_crtc_timing *crtc_timing);
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +8 -0
@@ -3133,6 +3133,14 @@ struct dmub_cmd_replay_set_coasting_vtotal_data {* Currently the support is only for 0 or 1 */ uint8_t panel_inst; +/** +* 16-bit value dicated by driver that indicates the coasting vtotal high byte part. +*/ +uint16_t coasting_vtotal_high; +/** +* Explicit padding to 4 byte boundary. +*/ +uint8_t pad[2 ]; };/**
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +1 -1
@@ -975,7 +975,7 @@ bool psr_su_set_dsc_slice_height(struct dc *dc, struct dc_link *link,void set_replay_coasting_vtotal (struct dc_link *link,enum replay_coasting_vtotal_type type, -uint16_t vtotal) +uint32_t vtotal) { link->replay_settings.coasting_vtotal_table[type] = vtotal; }
drivers/gpu/drm/amd/display/modules/power/power_helpers.h +1 -1
@@ -56,7 +56,7 @@ bool dmub_init_abm_config(struct resource_pool *res_pool,void init_replay_config (struct dc_link *link,struct replay_config *pr_config);void set_replay_coasting_vtotal (struct dc_link *link,enum replay_coasting_vtotal_type type, -uint16_t vtotal); +uint32_t vtotal);void set_replay_ips_full_screen_video_src_vtotal (struct dc_link *link,uint16_t vtotal);void calculate_replay_link_off_frame_count (struct dc_link *link,uint16_t vtotal,uint16_t htotal);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 215/399 drm/amd/display: Lock all enabled otg pipes even with no planes
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenjing Liu <[email protected]>
[ Upstream commit 94040c2cbb1a872ff779da06bf034ccfee0f9cba ]
[WHY]
On DCN32 we support dynamic ODM even when OTG is blanked. When ODM configuration is dynamically changed and the OTG is on blank pattern, we will need to reprogram OPP's test pattern based on new ODM configuration. Therefore we need to lock the OTG pipe to avoid temporary corruption when we are reprogramming OPP blank patterns.
[HOW]
Add a new interdependent update lock implementation to lock all enabled OTG pipes even when there is no plane on the OTG for DCN32.
--- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 23 +++++++++++++++++++ .../amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 2 ++ .../amd/display/dc/hwss/dcn32/dcn32_init.c | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c +23 -0
@@ -1785,3 +1785,26 @@ void dcn32_prepare_bandwidth(struct dc *dc, context->bw_ctx.bw.dcn.clk.p_state_change_support = p_state_change_support; } } + +void dcn32_interdependent_update_lock (struct dc *dc, +struct dc_state *context,bool lock) +{ +unsigned int i; +struct pipe_ctx *pipe; +struct timing_generator *tg; + +for (i =0 ; i < dc->res_pool->pipe_count; i++) { + pipe = &context->res_ctx.pipe_ctx[i]; + tg = pipe->stream_res.tg; + +if (!resource_is_pipe_type (pipe,OTG_MASTER ) || + !tg->funcs->is_tg_enabled (tg) || +dc_state_get_pipe_subvp_type (context, pipe) ==SUBVP_PHANTOM ) +continue ; + +if (lock) + dc->hwss.pipe_control_lock (dc, pipe, true); +else + dc->hwss.pipe_control_lock (dc, pipe, false); + } +}
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h +2 -0
@@ -129,4 +129,6 @@ bool dcn32_is_pipe_topology_transition_seamless(struct dc *dc,void dcn32_prepare_bandwidth (struct dc *dc,struct dc_state *context); +void dcn32_interdependent_update_lock (struct dc *dc, +struct dc_state *context,bool lock);#endif /* __DC_HWSS_DCN32_H__ */
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c +1 -1
@@ -58,7 +58,7 @@ static const struct hw_sequencer_funcs dcn32_funcs = { .disable_plane = dcn20_disable_plane, .disable_pixel_data = dcn20_disable_pixel_data, .pipe_control_lock = dcn20_pipe_control_lock, - .interdependent_update_lock = dcn10_lock_all_pipes, + .interdependent_update_lock = dcn32_interdependent_update_lock, .cursor_lock = dcn10_cursor_lock, .prepare_bandwidth = dcn32_prepare_bandwidth, .optimize_bandwidth = dcn20_optimize_bandwidth,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 216/399 drm/amd/display: Implement wait_for_odm_update_pending_complete
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenjing Liu <[email protected]>
[ Upstream commit 2d7f3d1a5866705be2393150e1ffdf67030ab88d ]
[WHY]
Odm update is doubled buffered. We need to wait for ODM update to be completed before optimizing bandwidth or programming new udpates.
[HOW]
implement wait_for_odm_update_pending_complete function to wait for:
1. odm configuration update is no longer pending in timing generator.
2. no pending dpg pattern update for each active OPP.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 56 ++++++++++++++++++- .../gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 14 +++++ .../gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 2 + .../drm/amd/display/dc/dcn201/dcn201_opp.c | 1 + .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 4 +- drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 3 + .../amd/display/dc/inc/hw/timing_generator.h | 1 + .../amd/display/dc/optc/dcn10/dcn10_optc.h | 3 +- .../amd/display/dc/optc/dcn32/dcn32_optc.c | 8 +++ .../amd/display/dc/optc/dcn32/dcn32_optc.h | 1 + 11 files changed, 90 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +55 -1
@@ -1282,6 +1282,54 @@ static void disable_vbios_mode_if_required( } } +/** +* wait_for_blank_complete - wait for all active OPPs to finish pending blank +* pattern updates +* +* @dc: [in] dc reference +* @context: [in] hardware context in use +*/ +static void wait_for_blank_complete (struct dc *dc, +struct dc_state *context) +{ +struct pipe_ctx *opp_head; +struct dce_hwseq *hws = dc->hwseq; +int i; + +if (!hws->funcs.wait_for_blank_complete) +return ; + +for (i =0 ; i <MAX_PIPES ; i++) { + opp_head = &context->res_ctx.pipe_ctx[i]; + +if (!resource_is_pipe_type (opp_head,OPP_HEAD ) || +dc_state_get_pipe_subvp_type (context, opp_head) ==SUBVP_PHANTOM ) +continue ; + + hws->funcs.wait_for_blank_complete (opp_head->stream_res.opp); + } +} + +static void wait_for_odm_update_pending_complete (struct dc *dc,struct dc_state *context) +{ +struct pipe_ctx *otg_master; +struct timing_generator *tg; +int i; + +for (i =0 ; i <MAX_PIPES ; i++) { + otg_master = &context->res_ctx.pipe_ctx[i]; +if (!resource_is_pipe_type (otg_master,OTG_MASTER ) || +dc_state_get_pipe_subvp_type (context, otg_master) ==SUBVP_PHANTOM ) +continue ; + tg = otg_master->stream_res.tg; +if (tg->funcs->wait_odm_doublebuffer_pending_clear) + tg->funcs->wait_odm_doublebuffer_pending_clear (tg); + } + +/* ODM update may require to reprogram blank pattern for each OPP */ +wait_for_blank_complete (dc, context); +} +static void wait_for_no_pipes_pending (struct dc *dc,struct dc_state *context) {int i;
@@ -1969,6 +2017,11 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c context->stream_count == 0) {/* Must wait for no flips to be pending before doing optimize bw */ wait_for_no_pipes_pending (dc, context); +/* +* optimized dispclk depends on ODM setup. Need to wait for ODM +* update pending complete before optimizing bandwidth. +*/ +wait_for_odm_update_pending_complete (dc, context);/* pplib is notified if disp_num changed */ dc->hwss.optimize_bandwidth (dc, context);/* Need to do otg sync again as otg could be out of sync due to otg
@@ -3447,7 +3500,7 @@ static void commit_planes_for_stream_fast(struct dc *dc, top_pipe_to_program->stream->update_flags.raw =0 ; } -static void wait_for_outstanding_hw_updates (struct dc *dc,const struct dc_state *dc_context) +static void wait_for_outstanding_hw_updates (struct dc *dc,struct dc_state *dc_context) {/* * This function calls HWSS to wait for any potentially double buffered
@@ -3485,6 +3538,7 @@ static void wait_for_outstanding_hw_updates(struct dc *dc, const struct dc_state } } } +wait_for_odm_update_pending_complete (dc, dc_context); } static void commit_planes_for_stream(struct dc *dc,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c +1 -0
@@ -377,6 +377,7 @@ static const struct opp_funcs dcn10_opp_funcs = { .opp_set_disp_pattern_generator = NULL, .opp_program_dpg_dimensions = NULL, .dpg_is_blanked = NULL, + .dpg_is_pending = NULL, .opp_destroy = opp1_destroy };
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c +14 -0
@@ -337,6 +337,19 @@ bool opp2_dpg_is_blanked(struct output_pixel_processor *opp) (double_buffer_pending ==0 ); } +bool opp2_dpg_is_pending (struct output_pixel_processor *opp) +{ +struct dcn20_opp *oppn20 =TO_DCN20_OPP (opp); +uint32_t double_buffer_pending; +uint32_t dpg_en; + +REG_GET (DPG_CONTROL ,DPG_EN , &dpg_en); + +REG_GET (DPG_STATUS ,DPG_DOUBLE_BUFFER_PENDING , &double_buffer_pending); + +return (dpg_en ==1 && double_buffer_pending ==1 ); +} +void opp2_program_left_edge_extra_pixel (struct output_pixel_processor *opp,bool count)
@@ -363,6 +376,7 @@ static struct opp_funcs dcn20_opp_funcs = { .opp_set_disp_pattern_generator = opp2_set_disp_pattern_generator, .opp_program_dpg_dimensions = opp2_program_dpg_dimensions, .dpg_is_blanked = opp2_dpg_is_blanked, + .dpg_is_pending = opp2_dpg_is_pending, .opp_dpg_set_blank_color = opp2_dpg_set_blank_color, .opp_destroy = opp1_destroy, .opp_program_left_edge_extra_pixel = opp2_program_left_edge_extra_pixel,
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h +2 -0
@@ -159,6 +159,8 @@ void opp2_program_dpg_dimensions(bool opp2_dpg_is_blanked (struct output_pixel_processor *opp); +bool opp2_dpg_is_pending (struct output_pixel_processor *opp); +void opp2_dpg_set_blank_color (struct output_pixel_processor *opp,const struct tg_color *color);
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c +1 -0
@@ -50,6 +50,7 @@ static struct opp_funcs dcn201_opp_funcs = { .opp_set_disp_pattern_generator = opp2_set_disp_pattern_generator, .opp_program_dpg_dimensions = opp2_program_dpg_dimensions, .dpg_is_blanked = opp2_dpg_is_blanked, + .dpg_is_pending = opp2_dpg_is_pending, .opp_dpg_set_blank_color = opp2_dpg_set_blank_color, .opp_destroy = opp1_destroy, .opp_program_left_edge_extra_pixel = opp2_program_left_edge_extra_pixel,
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +2 -2
@@ -2345,7 +2345,7 @@ bool dcn20_wait_for_blank_complete(int counter;for (counter =0 ; counter <1000 ; counter++) { -if (opp->funcs->dpg_is_blanked (opp)) +if (!opp->funcs->dpg_is_pending (opp))break ;udelay (100 );
@@ -2356,7 +2356,7 @@ bool dcn20_wait_for_blank_complete(return false; } -return true; +return opp->funcs->dpg_is_blanked (opp); }bool dcn20_dmdata_status_done (struct pipe_ctx *pipe_ctx)
drivers/gpu/drm/amd/display/dc/inc/hw/opp.h +3 -0
@@ -321,6 +321,9 @@ struct opp_funcs {bool (*dpg_is_blanked)(struct output_pixel_processor *opp); +bool (*dpg_is_pending)(struct output_pixel_processor *opp); + +void (*opp_dpg_set_blank_color)(struct output_pixel_processor *opp,const struct tg_color *color);
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +1 -0
@@ -333,6 +333,7 @@ struct timing_generator_funcs {void (*init_odm)(struct timing_generator *tg);void (*wait_drr_doublebuffer_pending_clear)(struct timing_generator *tg); + void (*wait_odm_doublebuffer_pending_clear)(struct timing_generator *tg); };#endif
drivers/gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h +2 -1
@@ -557,7 +557,8 @@ struct dcn_optc_registers {type OTG_CRC_DATA_STREAM_SPLIT_MODE ;\type OTG_CRC_DATA_FORMAT ;\type OTG_V_TOTAL_LAST_USED_BY_DRR ;\ -type OTG_DRR_TIMING_DBUF_UPDATE_PENDING ; +type OTG_DRR_TIMING_DBUF_UPDATE_PENDING ;\ +type OTG_H_TIMING_DIV_MODE_DB_UPDATE_PENDING ;#define TG_REG_FIELD_LIST_DCN3_2 (type) \ type OTG_H_TIMING_DIV_MODE_MANUAL;
drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c +8 -0
@@ -122,6 +122,13 @@ void optc32_get_odm_combine_segments(struct timing_generator *tg, int *odm_combi } } +void optc32_wait_odm_doublebuffer_pending_clear (struct timing_generator *tg) +{ +struct optc *optc1 =DCN10TG_FROM_TG (tg); + +REG_WAIT (OTG_DOUBLE_BUFFER_CONTROL ,OTG_H_TIMING_DIV_MODE_DB_UPDATE_PENDING ,0 ,2 ,50000 ); +} +void optc32_set_h_timing_div_manual_mode (struct timing_generator *optc,bool manual_mode) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -345,6 +352,7 @@ static struct timing_generator_funcs dcn32_tg_funcs = { .set_odm_bypass = optc32_set_odm_bypass, .set_odm_combine = optc32_set_odm_combine, .get_odm_combine_segments = optc32_get_odm_combine_segments, + .wait_odm_doublebuffer_pending_clear = optc32_wait_odm_doublebuffer_pending_clear, .set_h_timing_div_manual_mode = optc32_set_h_timing_div_manual_mode, .get_optc_source = optc2_get_optc_source, .set_out_mux = optc3_set_out_mux,
drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h +1 -0
@@ -183,5 +183,6 @@ void optc32_set_h_timing_div_manual_mode(struct timing_generator *optc, bool manvoid optc32_get_odm_combine_segments (struct timing_generator *tg,int *odm_combine_segments);void optc32_set_odm_bypass (struct timing_generator *optc,const struct dc_crtc_timing *dc_crtc_timing); +void optc32_wait_odm_doublebuffer_pending_clear (struct timing_generator *tg);#endif /* __DC_OPTC_DCN32_H__ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 217/399 drm/amd/display: Return the correct HDCP error code
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rodrigo Siqueira <[email protected]>
[ Upstream commit e64b3f55e458ce7e2087a0051f47edabf74545e7 ]
[WHY & HOW]
If the display is null when creating an HDCP session, return a proper error code.
--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +3 -0
@@ -513,6 +513,9 @@ enum mod_hdcp_status mod_hdcp_hdcp2_create_session(struct mod_hdcp *hdcp) hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf;memset (hdcp_cmd,0 ,sizeof (struct ta_hdcp_shared_memory )); +if (!display) +return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND ; + hdcp_cmd->in_msg.hdcp2_create_session_v2.display_handle = display->index;if (hdcp->connection.link.adjust.hdcp2.force_type ==MOD_HDCP_FORCE_TYPE_0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 218/399 drm/amd/display: Add a dc_state NULL check in dc_state_release
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Allen Pan <[email protected]>
[ Upstream commit 334b56cea5d9df5989be6cf1a5898114fa70ad98 ]
[How]
Check wheather state is NULL before releasing it.
--- drivers/gpu/drm/amd/display/dc/core/dc_state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_state.c +2 -1
@@ -334,7 +334,8 @@ static void dc_state_free(struct kref *kref)void dc_state_release (struct dc_state *state) { -kref_put (&state->refcount, dc_state_free); +if (state !=NULL ) +kref_put (&state->refcount, dc_state_free); }/* * dc_state_add_stream() - Add a new dc_stream_state to a dc_state.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 219/399 drm/amd/display: Fix noise issue on HDMI AV mute
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Ma <[email protected]>
[ Upstream commit 69e3be6893a7e668660b05a966bead82bbddb01d ]
[Why]
When mode switching is triggered there is momentary noise visible on some HDMI TV or displays.
[How]
Wait for 2 frames to make sure we have enough time to send out AV mute and sink receives a full frame.
--- .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c +11 -1
@@ -663,10 +663,20 @@ void dcn30_set_avmute(struct pipe_ctx *pipe_ctx, bool enable)if (pipe_ctx ==NULL )return ; -if (dc_is_hdmi_signal (pipe_ctx->stream->signal) && pipe_ctx->stream_res.stream_enc !=NULL ) +if (dc_is_hdmi_signal (pipe_ctx->stream->signal) && pipe_ctx->stream_res.stream_enc !=NULL ) { pipe_ctx->stream_res.stream_enc->funcs->set_avmute ( pipe_ctx->stream_res.stream_enc, enable); + +/* Wait for two frame to make sure AV mute is sent out */ +if (enable) { + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VBLANK ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VBLANK ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); + } + } }void dcn30_update_info_frame (struct pipe_ctx *pipe_ctx)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 220/399 dm snapshot: fix lockup in dm_exception_table_exit
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
[ Upstream commit 6e7132ed3c07bd8a6ce3db4bb307ef2852b322dc ]
There was reported lockup when we exit a snapshot with many exceptions. Fix this by adding "cond_resched" to the loop that frees the exceptions.
--- drivers/md/dm-snap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/dm-snap.c +3 -1
@@ -684,8 +684,10 @@ static void dm_exception_table_exit(struct dm_exception_table *et,for (i =0 ; i < size; i++) { slot = et->table + i; -hlist_bl_for_each_entry_safe (ex, pos, n, slot, hash_list) +hlist_bl_for_each_entry_safe (ex, pos, n, slot, hash_list) {kmem_cache_free (mem, ex); +cond_resched (); + } }kvfree (et->table);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 221/399 x86/pm: Work around false positive kmemleak report in msr_build_context()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Altaparmakov <[email protected]>
[ Upstream commit e3f269ed0accbb22aa8f25d2daffa23c3fccd407 ]
Since:
7ee18d677989 ("x86/power: Make restore_processor_context() sane")
kmemleak reports this issue:
unreferenced object 0xf68241e0 (size 32):
comm "swapper/0", pid 1, jiffies 4294668610 (age 68.432s)
hex dump (first 32 bytes):
00 cc cc cc 29 10 01 c0 00 00 00 00 00 00 00 00 ....)...........
00 42 82 f6 cc cc cc cc cc cc cc cc cc cc cc cc .B..............
backtrace:
[<461c1d50>] __kmem_cache_alloc_node+0x106/0x260
[<ea65e13b>] __kmalloc+0x54/0x160
[<c3858cd2>] msr_build_context.constprop.0+0x35/0x100
[<46635aff>] pm_check_save_msr+0x63/0x80
[<6b6bb938>] do_one_initcall+0x41/0x1f0
[<3f3add60>] kernel_init_freeable+0x199/0x1e8
[<3b538fde>] kernel_init+0x1a/0x110
[<938ae2b2>] ret_from_fork+0x1c/0x28Which is a false positive.
Reproducer:
- Run rsync of whole kernel tree (multiple times if needed).
- start a kmemleak scan
- Note this is just an example: a lot of our internal tests hit these.
The root cause is similar to the fix in:
b0b592cf0836 x86/pm: Fix false positive kmemleak report in msr_build_context()
ie. the alignment within the packed struct saved_context which has everything unaligned as there is only "u16 gs;" at start of struct where in the past there were four u16 there thus aligning everything afterwards. The issue is with the fact that Kmemleak only searches for pointers that are aligned (see how pointers are scanned in kmemleak.c) so when the struct members are not aligned it doesn't see them.
Testing:
We run a lot of tests with our CI, and after applying this fix we do not see any kmemleak issues any more whilst without it we see hundreds of the above report. From a single, simple test run consisting of 416 individual test cases on kernel 5.10 x86 with kmemleak enabled we got 20 failures due to this, which is quite a lot. With this fix applied we get zero kmemleak related failures.
--- arch/x86/include/asm/suspend_32.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/asm/suspend_32.h +5 -5
@@ -12,11 +12,6 @@/* image of the saved processor state */ struct saved_context { -/* -* On x86_32, all segment registers except gs are saved at kernel -* entry in pt_regs. -*/ -u16 gs;unsigned long cr0, cr2, cr3, cr4;u64 misc_enable;struct saved_msrs saved_msrs;
@@ -27,6 +22,11 @@ struct saved_context {unsigned long tr;unsigned long safety;unsigned long return_address; +/* +* On x86_32, all segment registers except gs are saved at kernel +* entry in pt_regs. +*/ +u16 gs;bool misc_enable_saved; } __attribute__((packed));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 222/399 wifi: brcmfmac: add per-vendor feature detection callback
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arend van Spriel <[email protected]>
[ Upstream commit 14e1391b71027948cdbacdbea4bf8858c2068eb7 ]
Adding a .feat_attach() callback allowing per-vendor overrides of the driver feature flags. In this patch the callback is only provided by BCA vendor to disable SAE feature as it has not been confirmed yet. BCA chips generally do not have the in-driver supplicant (idsup) feature so they rely on NL80211_CMD_EXTERNAL_AUTH to trigger user-space authentication.
Stable-dep-of: 85da8f71aaa7 ("wifi: brcmfmac: Demote vendor-specific attach/detach messages to info")
--- .../wireless/broadcom/brcm80211/brcmfmac/bca/core.c | 8 ++++++++ .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +++ .../net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h | 12 ++++++++++++ 3 files changed, 23 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c +8 -0
@@ -7,6 +7,7 @@#include <core.h> #include <bus.h> #include <fwvid.h> +#include <feature.h> #include "vops.h"
@@ -21,7 +22,14 @@ static void brcmf_bca_detach(struct brcmf_pub *drvr)pr_err ("%s: executing\n" , __func__); } +static void brcmf_bca_feat_attach (struct brcmf_if *ifp) +{ +/* SAE support not confirmed so disabling for now */ + ifp->drvr->feat_flags &= ~BIT (BRCMF_FEAT_SAE ); +} +const struct brcmf_fwvid_ops brcmf_bca_ops = { .attach = brcmf_bca_attach, .detach = brcmf_bca_detach, + .feat_attach = brcmf_bca_feat_attach, };
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +3 -0
@@ -13,6 +13,7 @@#include "debug.h" #include "fwil.h" #include "fwil_types.h" +#include "fwvid.h" #include "feature.h" #include "common.h"
@@ -339,6 +340,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)brcmf_feat_iovar_int_get (ifp,BRCMF_FEAT_FWSUP ,"sup_wpa" );brcmf_feat_iovar_int_get (ifp,BRCMF_FEAT_SCAN_V2 ,"scan_ver" ); +brcmf_fwvid_feat_attach (ifp); +if (drvr->settings->feature_disable) { brcmf_dbg(INFO, "Features: 0x%02x, disable: 0x%02x\n", ifp->drvr->feat_flags,
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h +12 -0
@@ -8,10 +8,12 @@#include "firmware.h" struct brcmf_pub ; +struct brcmf_if ;struct brcmf_fwvid_ops {int (*attach)(struct brcmf_pub *drvr);void (*detach)(struct brcmf_pub *drvr); +void (*feat_attach)(struct brcmf_if *ifp); };/* exported functions */
@@ -44,4 +46,14 @@ static inline void brcmf_fwvid_detach(struct brcmf_pub *drvr) brcmf_fwvid_detach_ops(drvr); } +static inline void brcmf_fwvid_feat_attach (struct brcmf_if *ifp) +{ +const struct brcmf_fwvid_ops *vops = ifp->drvr->vops; + +if (!vops->feat_attach) +return ; + + vops->feat_attach (ifp); +} +#endif /* FWVID_H_ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 223/399 wifi: brcmfmac: cfg80211: Use WSEC to set SAE password
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit 9f7861c56b51b84d30114e7fea9d744a9d5ba9b7 ]
Using the WSEC command instead of sae_password seems to be the supported mechanism on newer firmware, and also how the brcmdhd driver does it.
The existing firmware mechanism intended for (some) Cypress chips has been separated from the new firmware mechanism using the multi-vendor framework. Depending on the device it will select the appropriate firmware mechanism.
This makes WPA3 work with iwd, or with wpa_supplicant pending a support patchset [2].
[1] https://rachelbythebay.com/w/2023/11/06/wpa3/
[2] http://lists.infradead.org/pipermail/hostap/2023-July/041653.html
Stable-dep-of: 85da8f71aaa7 ("wifi: brcmfmac: Demote vendor-specific attach/detach messages to info")
--- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 56 ++++++++----------- .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 + .../broadcom/brcm80211/brcmfmac/cyw/core.c | 28 ++++++++++ .../broadcom/brcm80211/brcmfmac/fwil.c | 1 + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- .../broadcom/brcm80211/brcmfmac/fwvid.h | 13 +++++ .../broadcom/brcm80211/brcmfmac/wcc/core.c | 9 +++ 7 files changed, 76 insertions(+), 35 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +22 -34
@@ -32,6 +32,7 @@#include "vendor.h" #include "bus.h" #include "common.h" +#include "fwvid.h" #define BRCMF_SCAN_IE_LEN_MAX 2048
@@ -1686,52 +1687,39 @@ static u16 brcmf_map_fw_linkdown_reason(const struct brcmf_event_msg *e)return reason; } -static int brcmf_set_pmk (struct brcmf_if *ifp,const u8 *pmk_data,u16 pmk_len) +int brcmf_set_wsec (struct brcmf_if *ifp,const u8 *key,u16 key_len,u16 flags) {struct brcmf_pub *drvr = ifp->drvr;struct brcmf_wsec_pmk_le pmk;int err; +if (key_len >sizeof (pmk.key)) { +bphy_err (drvr,"key must be less than %zu bytes\n" , +sizeof (pmk.key)); +return -EINVAL ; + } +memset (&pmk,0 ,sizeof (pmk)); -/* pass pmk directly */ - pmk.key_len =cpu_to_le16 (pmk_len); - pmk.flags =cpu_to_le16 (0 ); -memcpy (pmk.key, pmk_data, pmk_len); +/* pass key material directly */ + pmk.key_len =cpu_to_le16 (key_len); + pmk.flags =cpu_to_le16 (flags); +memcpy (pmk.key, key, key_len); -/* store psk in firmware */ +/* store key material in firmware */ err =brcmf_fil_cmd_data_set (ifp,BRCMF_C_SET_WSEC_PMK , &pmk,sizeof (pmk));if (err <0 )bphy_err (drvr,"failed to change PSK in firmware (len=%u)\n" , - pmk_len); + key_len);return err; } +BRCMF_EXPORT_SYMBOL_GPL (brcmf_set_wsec); -static int brcmf_set_sae_password (struct brcmf_if *ifp,const u8 *pwd_data, -u16 pwd_len) +static int brcmf_set_pmk (struct brcmf_if *ifp,const u8 *pmk_data,u16 pmk_len) { -struct brcmf_pub *drvr = ifp->drvr; -struct brcmf_wsec_sae_pwd_le sae_pwd; -int err; - -if (pwd_len >BRCMF_WSEC_MAX_SAE_PASSWORD_LEN ) { -bphy_err (drvr,"sae_password must be less than %d\n" , -BRCMF_WSEC_MAX_SAE_PASSWORD_LEN ); -return -EINVAL ; - } - - sae_pwd.key_len =cpu_to_le16 (pwd_len); -memcpy (sae_pwd.key, pwd_data, pwd_len); - - err =brcmf_fil_iovar_data_set (ifp,"sae_password" , &sae_pwd, -sizeof (sae_pwd)); -if (err <0 ) -bphy_err (drvr,"failed to set SAE password in firmware (len=%u)\n" , - pwd_len); - -return err; +return brcmf_set_wsec (ifp, pmk_data, pmk_len,0 ); } static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason,
@@ -2502,8 +2490,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,bphy_err (drvr,"failed to clean up user-space RSNE\n" ); goto done; } - err =brcmf_set_sae_password (ifp, sme->crypto.sae_pwd, - sme->crypto.sae_pwd_len); + err =brcmf_fwvid_set_sae_password (ifp, &sme->crypto);if (!err && sme->crypto.psk) err =brcmf_set_pmk (ifp, sme->crypto.psk,BRCMF_WSEC_MAX_PSK_LEN );
@@ -5256,8 +5243,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,if (crypto->sae_pwd) {brcmf_dbg (INFO ,"using SAE offload\n" ); profile->use_fwauth |=BIT (BRCMF_PROFILE_FWAUTH_SAE ); - err =brcmf_set_sae_password (ifp, crypto->sae_pwd, - crypto->sae_pwd_len); + err =brcmf_fwvid_set_sae_password (ifp, crypto);if (err <0 ) goto exit; }
@@ -5364,10 +5350,12 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev,msleep (400 );if (profile->use_fwauth !=BIT (BRCMF_PROFILE_FWAUTH_NONE )) { +struct cfg80211_crypto_settings crypto = {}; +if (profile->use_fwauth &BIT (BRCMF_PROFILE_FWAUTH_PSK ))brcmf_set_pmk (ifp,NULL ,0 );if (profile->use_fwauth &BIT (BRCMF_PROFILE_FWAUTH_SAE )) -brcmf_set_sae_password (ifp,NULL ,0 ); +brcmf_fwvid_set_sae_password (ifp, &crypto); profile->use_fwauth =BIT (BRCMF_PROFILE_FWAUTH_NONE ); }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +2 -0
@@ -468,4 +468,6 @@ void brcmf_set_mpc(struct brcmf_if *ndev, int mpc);void brcmf_abort_scanning (struct brcmf_cfg80211_info *cfg);void brcmf_cfg80211_free_netdev (struct net_device *ndev); +int brcmf_set_wsec (struct brcmf_if *ifp,const u8 *key,u16 key_len,u16 flags); +#endif /* BRCMFMAC_CFG80211_H */
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +28 -0
@@ -7,6 +7,7 @@#include <core.h> #include <bus.h> #include <fwvid.h> +#include <fwil.h> #include "vops.h"
@@ -21,7 +22,34 @@ static void brcmf_cyw_detach(struct brcmf_pub *drvr)pr_err ("%s: executing\n" , __func__); } +static int brcmf_cyw_set_sae_pwd (struct brcmf_if *ifp, +struct cfg80211_crypto_settings *crypto) +{ +struct brcmf_pub *drvr = ifp->drvr; +struct brcmf_wsec_sae_pwd_le sae_pwd; +u16 pwd_len = crypto->sae_pwd_len; +int err; + +if (pwd_len >BRCMF_WSEC_MAX_SAE_PASSWORD_LEN ) { +bphy_err (drvr,"sae_password must be less than %d\n" , +BRCMF_WSEC_MAX_SAE_PASSWORD_LEN ); +return -EINVAL ; + } + + sae_pwd.key_len =cpu_to_le16 (pwd_len); +memcpy (sae_pwd.key, crypto->sae_pwd, pwd_len); + + err =brcmf_fil_iovar_data_set (ifp,"sae_password" , &sae_pwd, +sizeof (sae_pwd)); +if (err <0 ) +bphy_err (drvr,"failed to set SAE password in firmware (len=%u)\n" , + pwd_len); + +return err; +} +const struct brcmf_fwvid_ops brcmf_cyw_ops = { .attach = brcmf_cyw_attach, .detach = brcmf_cyw_detach, + .set_sae_password = brcmf_cyw_set_sae_pwd, };
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c +1 -0
@@ -239,6 +239,7 @@ brcmf_fil_iovar_data_set(struct brcmf_if *ifp, const char *name, const void *datmutex_unlock (&drvr->proto_block);return err; } +BRCMF_EXPORT_SYMBOL_GPL (brcmf_fil_iovar_data_set); s32 brcmf_fil_iovar_data_get(struct brcmf_if *ifp, const char *name, void *data,
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +1 -1
@@ -584,7 +584,7 @@ struct brcmf_wsec_key_le {struct brcmf_wsec_pmk_le {__le16 key_len;__le16 flags; -u8 key[2 *BRCMF_WSEC_MAX_PSK_LEN +1 ]; +u8 key[BRCMF_WSEC_MAX_SAE_PASSWORD_LEN ]; };/**
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h +13 -0
@@ -6,6 +6,7 @@#define FWVID_H_ #include "firmware.h" +#include "cfg80211.h" struct brcmf_pub ;struct brcmf_if ;
@@ -14,6 +15,7 @@ struct brcmf_fwvid_ops {int (*attach)(struct brcmf_pub *drvr);void (*detach)(struct brcmf_pub *drvr);void (*feat_attach)(struct brcmf_if *ifp); +int (*set_sae_password)(struct brcmf_if *ifp,struct cfg80211_crypto_settings *crypto); };/* exported functions */
@@ -56,4 +58,15 @@ static inline void brcmf_fwvid_feat_attach(struct brcmf_if *ifp) vops->feat_attach(ifp); } +static inline int brcmf_fwvid_set_sae_password (struct brcmf_if *ifp, +struct cfg80211_crypto_settings *crypto) +{ +const struct brcmf_fwvid_ops *vops = ifp->drvr->vops; + +if (!vops || !vops->set_sae_password) +return -EOPNOTSUPP ; + +return vops->set_sae_password (ifp, crypto); +} +#endif /* FWVID_H_ */
drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c +9 -0
@@ -7,6 +7,7 @@#include <core.h> #include <bus.h> #include <fwvid.h> +#include <fwil.h> #include "vops.h"
@@ -21,7 +22,15 @@ static void brcmf_wcc_detach(struct brcmf_pub *drvr)pr_debug ("%s: executing\n" , __func__); } +static int brcmf_wcc_set_sae_pwd (struct brcmf_if *ifp, +struct cfg80211_crypto_settings *crypto) +{ +return brcmf_set_wsec (ifp, crypto->sae_pwd, crypto->sae_pwd_len, +BRCMF_WSEC_PASSPHRASE ); +} +const struct brcmf_fwvid_ops brcmf_wcc_ops = { .attach = brcmf_wcc_attach, .detach = brcmf_wcc_detach, + .set_sae_password = brcmf_wcc_set_sae_pwd, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 224/399 wifi: brcmfmac: Demote vendor-specific attach/detach messages to info
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit 85da8f71aaa7b83ea7ef0e89182e0cd47e16d465 ]
People are getting spooked by brcmfmac errors on their boot console. There's no reason for these messages to be errors.
--- .../broadcom/brcm80211/brcmfmac/bca/core.c | 13 ---------- .../broadcom/brcm80211/brcmfmac/cyw/core.c | 13 ---------- .../broadcom/brcm80211/brcmfmac/fwvid.c | 7 +++-- .../broadcom/brcm80211/brcmfmac/fwvid.h | 26 ++----------------- .../broadcom/brcm80211/brcmfmac/wcc/core.c | 15 +---------- 5 files changed, 6 insertions(+), 68 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c +0 -13
@@ -11,17 +11,6 @@#include "vops.h" -static int brcmf_bca_attach (struct brcmf_pub *drvr) -{ -pr_err ("%s: executing\n" , __func__); -return 0 ; -} - -static void brcmf_bca_detach (struct brcmf_pub *drvr) -{ -pr_err ("%s: executing\n" , __func__); -} -static void brcmf_bca_feat_attach (struct brcmf_if *ifp) {/* SAE support not confirmed so disabling for now */
@@ -29,7 +18,5 @@ static void brcmf_bca_feat_attach(struct brcmf_if *ifp) }const struct brcmf_fwvid_ops brcmf_bca_ops = { - .attach = brcmf_bca_attach, - .detach = brcmf_bca_detach, .feat_attach = brcmf_bca_feat_attach, };
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +0 -13
@@ -11,17 +11,6 @@#include "vops.h" -static int brcmf_cyw_attach (struct brcmf_pub *drvr) -{ -pr_err ("%s: executing\n" , __func__); -return 0 ; -} - -static void brcmf_cyw_detach (struct brcmf_pub *drvr) -{ -pr_err ("%s: executing\n" , __func__); -} -static int brcmf_cyw_set_sae_pwd (struct brcmf_if *ifp,struct cfg80211_crypto_settings *crypto) {
@@ -49,7 +38,5 @@ static int brcmf_cyw_set_sae_pwd(struct brcmf_if *ifp, }const struct brcmf_fwvid_ops brcmf_cyw_ops = { - .attach = brcmf_cyw_attach, - .detach = brcmf_cyw_detach, .set_sae_password = brcmf_cyw_set_sae_pwd, };
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c +3 -4
@@ -89,8 +89,7 @@ int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *vmod,if (fwvid >=BRCMF_FWVENDOR_NUM )return -ERANGE ; -if (WARN_ON (!vmod) ||WARN_ON (!vops) || -WARN_ON (!vops->attach) ||WARN_ON (!vops->detach)) +if (WARN_ON (!vmod) ||WARN_ON (!vops))return -EINVAL ;if (WARN_ON (fwvid_list[fwvid].vmod))
@@ -150,7 +149,7 @@ static inline int brcmf_fwvid_request_module(enum brcmf_fwvendor fwvid) }#endif -int brcmf_fwvid_attach_ops (struct brcmf_pub *drvr) +int brcmf_fwvid_attach (struct brcmf_pub *drvr) {enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid;int ret;
@@ -175,7 +174,7 @@ int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr)return ret; } -void brcmf_fwvid_detach_ops (struct brcmf_pub *drvr) +void brcmf_fwvid_detach (struct brcmf_pub *drvr) {enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid;
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h +2 -24
@@ -12,8 +12,6 @@ struct brcmf_pub;struct brcmf_if ;struct brcmf_fwvid_ops { -int (*attach)(struct brcmf_pub *drvr); -void (*detach)(struct brcmf_pub *drvr);void (*feat_attach)(struct brcmf_if *ifp);int (*set_sae_password)(struct brcmf_if *ifp,struct cfg80211_crypto_settings *crypto); };
@@ -24,30 +22,10 @@ int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *mod,int brcmf_fwvid_unregister_vendor (enum brcmf_fwvendor fwvid,struct module *mod);/* core driver functions */ -int brcmf_fwvid_attach_ops (struct brcmf_pub *drvr); -void brcmf_fwvid_detach_ops (struct brcmf_pub *drvr); +int brcmf_fwvid_attach (struct brcmf_pub *drvr); +void brcmf_fwvid_detach (struct brcmf_pub *drvr);const char *brcmf_fwvid_vendor_name (struct brcmf_pub *drvr); -static inline int brcmf_fwvid_attach (struct brcmf_pub *drvr) -{ -int ret; - - ret =brcmf_fwvid_attach_ops (drvr); -if (ret) -return ret; - -return drvr->vops->attach (drvr); -} - -static inline void brcmf_fwvid_detach (struct brcmf_pub *drvr) -{ -if (!drvr->vops) -return ; - - drvr->vops->detach (drvr); -brcmf_fwvid_detach_ops (drvr); -} -static inline void brcmf_fwvid_feat_attach (struct brcmf_if *ifp) {const struct brcmf_fwvid_ops *vops = ifp->drvr->vops;
drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c +1 -14
@@ -7,21 +7,10 @@#include <core.h> #include <bus.h> #include <fwvid.h> -#include <fwil.h> +#include <cfg80211.h> #include "vops.h" -static int brcmf_wcc_attach (struct brcmf_pub *drvr) -{ -pr_debug ("%s: executing\n" , __func__); -return 0 ; -} - -static void brcmf_wcc_detach (struct brcmf_pub *drvr) -{ -pr_debug ("%s: executing\n" , __func__); -} -static int brcmf_wcc_set_sae_pwd (struct brcmf_if *ifp,struct cfg80211_crypto_settings *crypto) {
@@ -30,7 +19,5 @@ static int brcmf_wcc_set_sae_pwd(struct brcmf_if *ifp, }const struct brcmf_fwvid_ops brcmf_wcc_ops = { - .attach = brcmf_wcc_attach, - .detach = brcmf_wcc_detach, .set_sae_password = brcmf_wcc_set_sae_pwd, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 225/399 drm/ttm: Make sure the mapped tt pages are decrypted when needed
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zack Rusin <[email protected]>
[ Upstream commit 71ce046327cfd3aef3f93d1c44e091395eb03f8f ]
Some drivers require the mapped tt pages to be decrypted. In an ideal world this would have been handled by the dma layer, but the TTM page fault handling would have to be rewritten to able to do that.
A side-effect of the TTM page fault handling is using a dma allocation per order (via ttm_pool_alloc_page) which makes it impossible to just trivially use dma_mmap_attrs. As a result ttm has to be very careful about trying to make its pgprot for the mapped tt pages match what the dma layer thinks it is. At the ttm layer it's possible to deduce the requirement to have tt pages decrypted by checking whether coherent dma allocations have been requested and the system is running with confidential computing technologies.
This approach isn't ideal but keeping TTM matching DMAs expectations for the page properties is in general fragile, unfortunately proper fix would require a rewrite of TTM's page fault handling.
Fixes vmwgfx with SEV enabled.
v2: Explicitly include cc_platform.h
v3: Use CC_ATTR_GUEST_MEM_ENCRYPT instead of CC_ATTR_MEM_ENCRYPT to limit the scope to guests and log when memory decryption is enabled.
--- drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +++++++++++-- drivers/gpu/drm/ttm/ttm_tt.c | 13 +++++++++++++ include/drm/ttm/ttm_tt.h | 9 ++++++++- 3 files changed, 32 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_util.c +11 -2
@@ -294,7 +294,13 @@ pgprot_t ttm_io_prot(struct ttm_buffer_object *bo, struct ttm_resource *res,enum ttm_caching caching; man =ttm_manager_type (bo->bdev, res->mem_type); - caching = man->use_tt ? bo->ttm->caching : res->bus.caching; +if (man->use_tt) { + caching = bo->ttm->caching; +if (bo->ttm->page_flags &TTM_TT_FLAG_DECRYPTED ) + tmp =pgprot_decrypted (tmp); + }else { + caching = res->bus.caching; + }return ttm_prot_from_caching (caching, tmp); }
@@ -337,6 +343,8 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo, .no_wait_gpu = false };struct ttm_tt *ttm = bo->ttm; +struct ttm_resource_manager *man = +ttm_manager_type (bo->bdev, bo->resource->mem_type);pgprot_t prot;int ret;
@@ -346,7 +354,8 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,if (ret)return ret; -if (num_pages ==1 && ttm->caching == ttm_cached) { +if (num_pages ==1 && ttm->caching == ttm_cached && + !(man->use_tt && (ttm->page_flags &TTM_TT_FLAG_DECRYPTED ))) {/* * We're mapping a single page, and the desired * page protection is consistent with the bo.
drivers/gpu/drm/ttm/ttm_tt.c +13 -0
@@ -31,11 +31,14 @@#define pr_fmt (fmt) "[TTM] " fmt +#include <linux/cc_platform.h> #include <linux/sched.h> #include <linux/shmem_fs.h> #include <linux/file.h> #include <linux/module.h> #include <drm/drm_cache.h> +#include <drm/drm_device.h> +#include <drm/drm_util.h> #include <drm/ttm/ttm_bo.h> #include <drm/ttm/ttm_tt.h>
@@ -60,6 +63,7 @@ static atomic_long_t ttm_dma32_pages_allocated;int ttm_tt_create (struct ttm_buffer_object *bo,bool zero_alloc) {struct ttm_device *bdev = bo->bdev; +struct drm_device *ddev = bo->base.dev;uint32_t page_flags =0 ;dma_resv_assert_held (bo->base.resv);
@@ -81,6 +85,15 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc)pr_err ("Illegal buffer object type\n" );return -EINVAL ; } +/* +* When using dma_alloc_coherent with memory encryption the +* mapped TT pages need to be decrypted or otherwise the drivers +* will end up sending encrypted mem to the gpu. +*/ +if (bdev->pool.use_dma_alloc &&cc_platform_has (CC_ATTR_GUEST_MEM_ENCRYPT )) { + page_flags |=TTM_TT_FLAG_DECRYPTED ; +drm_info (ddev,"TT memory decryption enabled." ); + } bo->ttm = bdev->funcs->ttm_tt_create (bo, page_flags);if (unlikely (bo->ttm ==NULL ))
include/drm/ttm/ttm_tt.h +8 -1
@@ -79,6 +79,12 @@ struct ttm_tt {* page_flags = TTM_TT_FLAG_EXTERNAL | * TTM_TT_FLAG_EXTERNAL_MAPPABLE; * +* TTM_TT_FLAG_DECRYPTED: The mapped ttm pages should be marked as +* not encrypted. The framework will try to match what the dma layer +* is doing, but note that it is a little fragile because ttm page +* fault handling abuses the DMA api a bit and dma_map_attrs can't be +* used to assure pgprot always matches. +* * TTM_TT_FLAG_PRIV_POPULATED: TTM internal only. DO NOT USE. This is * set by TTM after ttm_tt_populate() has successfully returned, and is * then unset when TTM calls ttm_tt_unpopulate().
@@ -87,8 +93,9 @@ struct ttm_tt {#define TTM_TT_FLAG_ZERO_ALLOC BIT(1)#define TTM_TT_FLAG_EXTERNAL BIT(2)#define TTM_TT_FLAG_EXTERNAL_MAPPABLE BIT(3) +#define TTM_TT_FLAG_DECRYPTED BIT(4) -#define TTM_TT_FLAG_PRIV_POPULATED BIT(4) +#define TTM_TT_FLAG_PRIV_POPULATED BIT(5)uint32_t page_flags;/** @num_pages: Number of pages in the page array. */ uint32_t num_pages;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 226/399 drm/amd/display: Unify optimize_required flags and VRR adjustments
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aric Cyr <[email protected]>
[ Upstream commit dcbf438d48341dc60e08e3df92120a4aeb097c84 ]
[why]
There is only a single call to dc_post_update_surfaces_to_stream so there is no need to have two flags to control it. Unifying this to a single flag allows dc_stream_adjust_vmin_vmax to skip actual programming when there is no change required.
[how]
Remove wm_optimze_required flag and set only optimize_required in its place. Then in dc_stream_adjust_vmin_vmax, check that the stream timing range matches the requested one and skip programming if they are equal.
Stable-dep-of: a9b1a4f684b3 ("drm/amd/display: Add more checks for exiting idle in DC")
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 14 +++++--------- drivers/gpu/drm/amd/display/dc/dc.h | 1 - drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 -- .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 2 +- .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 8 ++++---- 5 files changed, 10 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +5 -9
@@ -411,9 +411,12 @@ bool dc_stream_adjust_vmin_vmax(struct dc *dc,* avoid conflicting with firmware updates. */ if (dc->ctx->dce_version >DCE_VERSION_MAX ) -if (dc->optimized_required || dc->wm_optimized_required) +if (dc->optimized_required)return false; +if (!memcmp (&stream->adjust, adjust,sizeof (*adjust))) +return true; + stream->adjust.v_total_max = adjust->v_total_max; stream->adjust.v_total_mid = adjust->v_total_mid; stream->adjust.v_total_mid_frame_num = adjust->v_total_mid_frame_num;
@@ -2280,7 +2283,6 @@ void dc_post_update_surfaces_to_stream(struct dc *dc) } dc->optimized_required = false; - dc->wm_optimized_required = false; } bool dc_set_generic_gpio_for_stereo(bool enable,
@@ -2703,8 +2705,6 @@ enum surface_update_type dc_check_update_surfaces_for_stream( }else if (memcmp (&dc->current_state->bw_ctx.bw.dcn.clk, &dc->clk_mgr->clks, offsetof(struct dc_clocks , prev_p_state_change_support)) !=0 ) { dc->optimized_required = true; } - - dc->optimized_required |= dc->wm_optimized_required; }return type;
@@ -2912,9 +2912,6 @@ static void copy_stream_update_to_stream(struct dc *dc,if (update->vrr_active_fixed) stream->vrr_active_fixed = *update->vrr_active_fixed; -if (update->crtc_timing_adjust) - stream->adjust = *update->crtc_timing_adjust; -if (update->dpms_off) stream->dpms_off = *update->dpms_off;
@@ -4350,8 +4347,7 @@ static bool full_update_required(struct dc *dc, stream_update->mst_bw_update || stream_update->func_shaper || stream_update->lut3d_func || - stream_update->pending_test_pattern || - stream_update->crtc_timing_adjust)) + stream_update->pending_test_pattern)) return true;if (stream) {
drivers/gpu/drm/amd/display/dc/dc.h +0 -1
@@ -1037,7 +1037,6 @@ struct dc {/* Require to optimize clocks and bandwidth for added/removed planes */ bool optimized_required; -bool wm_optimized_required;bool idle_optimizations_allowed;bool enable_c20_dtm_b0;
drivers/gpu/drm/amd/display/dc/dc_stream.h +0 -2
@@ -139,7 +139,6 @@ union stream_update_flags { uint32_t wb_update:1; uint32_t dsc_changed : 1; uint32_t mst_bw : 1; - uint32_t crtc_timing_adjust : 1; uint32_t fams_changed : 1; } bits;
@@ -326,7 +325,6 @@ struct dc_stream_update {struct dc_3dlut *lut3d_func;struct test_pattern *pending_test_pattern; -struct dc_crtc_timing_adjust *crtc_timing_adjust; }; bool dc_is_stream_unchanged(
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +1 -1
@@ -3079,7 +3079,7 @@ void dcn10_prepare_bandwidth( context, false); - dc->wm_optimized_required = hubbub->funcs->program_watermarks (hubbub, + dc->optimized_required |= hubbub->funcs->program_watermarks (hubbub, &context->bw_ctx.bw.dcn.watermarks, dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 , true);
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +4 -4
@@ -2160,10 +2160,10 @@ void dcn20_prepare_bandwidth( }/* program dchubbub watermarks: -* For assigning wm_optimized_required, use |= operator since we don't want +* For assigning optimized_required, use |= operator since we don't want * to clear the value if the optimize has not happened yet */ - dc->wm_optimized_required |= hubbub->funcs->program_watermarks (hubbub, + dc->optimized_required |= hubbub->funcs->program_watermarks (hubbub, &context->bw_ctx.bw.dcn.watermarks, dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 , false);
@@ -2176,10 +2176,10 @@ void dcn20_prepare_bandwidth(if (hubbub->funcs->program_compbuf_size) {if (context->bw_ctx.dml.ip.min_comp_buffer_size_kbytes) { compbuf_size_kb = context->bw_ctx.dml.ip.min_comp_buffer_size_kbytes; - dc->wm_optimized_required |= (compbuf_size_kb != dc->current_state->bw_ctx.dml.ip.min_comp_buffer_size_kbytes); + dc->optimized_required |= (compbuf_size_kb != dc->current_state->bw_ctx.dml.ip.min_comp_buffer_size_kbytes); }else { compbuf_size_kb = context->bw_ctx.bw.dcn.compbuf_size_kb; - dc->wm_optimized_required |= (compbuf_size_kb != dc->current_state->bw_ctx.bw.dcn.compbuf_size_kb); + dc->optimized_required |= (compbuf_size_kb != dc->current_state->bw_ctx.bw.dcn.compbuf_size_kb); } hubbub->funcs->program_compbuf_size (hubbub, compbuf_size_kb, false);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 227/399 drm/amd/display: Add more checks for exiting idle in DC
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Kazlauskas <[email protected]>
[ Upstream commit a9b1a4f684b32bcd33431b67acd6f4c275728380 ]
[Why]
Any interface that touches registers needs to wake up the system.
[How]
Add a new interface dc_exit_ips_for_hw_access that wraps the check for IPS support and insert it into the public DC interfaces that touch registers.
We don't re-enter, since we expect that the enter/exit to have been done on the DM side.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 42 +++++++++++++++++++ .../gpu/drm/amd/display/dc/core/dc_stream.c | 18 ++++++++ .../gpu/drm/amd/display/dc/core/dc_surface.c | 2 + drivers/gpu/drm/amd/display/dc/dc.h | 1 + 4 files changed, 63 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +42 -0
@@ -417,6 +417,8 @@ bool dc_stream_adjust_vmin_vmax(struct dc *dc,if (!memcmp (&stream->adjust, adjust,sizeof (*adjust)))return true; +dc_exit_ips_for_hw_access (dc); + stream->adjust.v_total_max = adjust->v_total_max; stream->adjust.v_total_mid = adjust->v_total_mid; stream->adjust.v_total_mid_frame_num = adjust->v_total_mid_frame_num;
@@ -457,6 +459,8 @@ bool dc_stream_get_last_used_drr_vtotal(struct dc *dc,int i =0 ; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -487,6 +491,8 @@ bool dc_stream_get_crtc_position(struct dc *dc,bool ret = false;struct crtc_position position; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -606,6 +612,8 @@ bool dc_stream_configure_crc(struct dc *dc, struct dc_stream_state *stream,if (pipe ==NULL )return false; +dc_exit_ips_for_hw_access (dc); +/* By default, capture the full frame */ param.windowa_x_start =0 ; param.windowa_y_start =0 ;
@@ -665,6 +673,8 @@ bool dc_stream_get_crc(struct dc *dc, struct dc_stream_state *stream,struct pipe_ctx *pipe;struct timing_generator *tg; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) { pipe = &dc->current_state->res_ctx.pipe_ctx[i];if (pipe->stream == stream)
@@ -689,6 +699,8 @@ void dc_stream_set_dyn_expansion(struct dc *dc, struct dc_stream_state *stream,int i;struct pipe_ctx *pipe_ctx; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {if (dc->current_state->res_ctx.pipe_ctx[i].stream == stream) {
@@ -724,6 +736,8 @@ void dc_stream_set_dither_option(struct dc_stream_state *stream,if (option >DITHER_OPTION_MAX )return ; +dc_exit_ips_for_hw_access (stream->ctx->dc); + stream->dither_option = option;memset (¶ms,0 ,sizeof (params));
@@ -748,6 +762,8 @@ bool dc_stream_set_gamut_remap(struct dc *dc, const struct dc_stream_state *strebool ret = false;struct pipe_ctx *pipes; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {if (dc->current_state->res_ctx.pipe_ctx[i].stream == stream) { pipes = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -765,6 +781,8 @@ bool dc_stream_program_csc_matrix(struct dc *dc, struct dc_stream_state *stream)bool ret = false;struct pipe_ctx *pipes; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {if (dc->current_state->res_ctx.pipe_ctx[i].stream == stream) {
@@ -791,6 +809,8 @@ void dc_stream_set_static_screen_params(struct dc *dc,struct pipe_ctx *pipes_affected[MAX_PIPES ];int num_pipes_affected =0 ; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i < num_streams; i++) {struct dc_stream_state *stream = streams[i];
@@ -1817,6 +1837,8 @@ void dc_enable_stereo(int i, j;struct pipe_ctx *pipe; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {if (context !=NULL ) { pipe = &context->res_ctx.pipe_ctx[i];
@@ -1836,6 +1858,8 @@ void dc_enable_stereo(void dc_trigger_sync (struct dc *dc,struct dc_state *context) {if (context->stream_count >1 && !dc->debug.disable_timing_sync) { +dc_exit_ips_for_hw_access (dc); +enable_timing_multisync (dc, context);program_timing_sync (dc, context); }
@@ -2097,6 +2121,8 @@ enum dc_status dc_commit_streams(struct dc *dc,if (!streams_changed (dc, streams, stream_count))return res; +dc_exit_ips_for_hw_access (dc); +DC_LOG_DC ("%s: %d streams\n" , __func__, stream_count);for (i =0 ; i < stream_count; i++) {
@@ -3429,6 +3455,8 @@ static void commit_planes_for_stream_fast(struct dc *dc,int i, j;struct pipe_ctx *top_pipe_to_program =NULL ;struct dc_stream_status *stream_status =NULL ; +dc_exit_ips_for_hw_access (dc); +dc_z10_restore (dc); top_pipe_to_program = resource_get_otg_master_for_stream(
@@ -3557,6 +3585,8 @@ static void commit_planes_for_stream(struct dc *dc,// dc->current_state anymore, so we have to cache it before we apply // the new SubVP context subvp_prev_use = false; +dc_exit_ips_for_hw_access (dc); +dc_z10_restore (dc);if (update_type ==UPDATE_TYPE_FULL )wait_for_outstanding_hw_updates (dc, context);
@@ -4437,6 +4467,8 @@ bool dc_update_planes_and_stream(struct dc *dc,bool is_plane_addition =0 ;bool is_fast_update_only; +dc_exit_ips_for_hw_access (dc); +populate_fast_updates (fast_update, srf_updates, surface_count, stream_update); is_fast_update_only =fast_update_only (dc, fast_update, srf_updates, surface_count, stream_update, stream);
@@ -4557,6 +4589,8 @@ void dc_commit_updates_for_stream(struct dc *dc,int i, j;struct dc_fast_update fast_update[MAX_SURFACES ] = {0 }; +dc_exit_ips_for_hw_access (dc); +populate_fast_updates (fast_update, srf_updates, surface_count, stream_update); stream_status =dc_stream_get_status (stream); context = dc->current_state;
@@ -4741,6 +4775,8 @@ void dc_set_power_state(case DC_ACPI_CM_POWER_STATE_D0 :dc_state_construct (dc, dc->current_state); +dc_exit_ips_for_hw_access (dc); +dc_z10_restore (dc); dc->hwss.init_hw (dc);
@@ -4882,6 +4918,12 @@ void dc_allow_idle_optimizations(struct dc *dc, bool allow) dc->idle_optimizations_allowed = allow; } +void dc_exit_ips_for_hw_access (struct dc *dc) +{ +if (dc->caps.ips_support) +dc_allow_idle_optimizations (dc, false); +} +bool dc_dmub_is_ips_idle_state (struct dc *dc) {if (dc->debug.disable_idle_power_optimizations)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +18 -0
@@ -423,6 +423,8 @@ bool dc_stream_add_writeback(struct dc *dc,return false; } +dc_exit_ips_for_hw_access (dc); + wb_info->dwb_params.out_transfer_func = stream->out_transfer_func; dwb = dc->res_pool->dwbc[wb_info->dwb_pipe_inst];
@@ -493,6 +495,8 @@ bool dc_stream_fc_disable_writeback(struct dc *dc,return false; } +dc_exit_ips_for_hw_access (dc); +if (dwb->funcs->set_fc_enable) dwb->funcs->set_fc_enable (dwb,DWB_FRAME_CAPTURE_DISABLE );
@@ -542,6 +546,8 @@ bool dc_stream_remove_writeback(struct dc *dc,return false; } +dc_exit_ips_for_hw_access (dc); +/* disable writeback */ if (dc->hwss.disable_writeback) {struct dwbc *dwb = dc->res_pool->dwbc[dwb_pipe_inst];
@@ -557,6 +563,8 @@ bool dc_stream_warmup_writeback(struct dc *dc,int num_dwb, struct dc_writeback_info *wb_info) { +dc_exit_ips_for_hw_access (dc ); +if (dc->hwss.mmhubbub_warmup)return dc->hwss.mmhubbub_warmup (dc, num_dwb, wb_info);else
@@ -569,6 +577,8 @@ uint32_t dc_stream_get_vblank_counter(const struct dc_stream_state *stream)struct resource_context *res_ctx = &dc->current_state->res_ctx; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg;
@@ -597,6 +607,8 @@ bool dc_stream_send_dp_sdp(const struct dc_stream_state *stream, dc = stream->ctx->dc; res_ctx = &dc->current_state->res_ctx; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];
@@ -628,6 +640,8 @@ bool dc_stream_get_scanoutpos(const struct dc_stream_state *stream,struct resource_context *res_ctx = &dc->current_state->res_ctx; +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i <MAX_PIPES ; i++) {struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg;
@@ -664,6 +678,8 @@ bool dc_stream_dmdata_status_done(struct dc *dc, struct dc_stream_state *stream)if (i ==MAX_PIPES )return true; +dc_exit_ips_for_hw_access (dc); +return dc->hwss.dmdata_status_done (pipe); }
@@ -698,6 +714,8 @@ bool dc_stream_set_dynamic_metadata(struct dc *dc, pipe_ctx->stream->dmdata_address = attr->address; +dc_exit_ips_for_hw_access (dc); + dc->hwss.program_dmdata_engine (pipe_ctx); if (hubp->funcs->dmdata_set_attributes != NULL &&
drivers/gpu/drm/amd/display/dc/core/dc_surface.c +2 -0
@@ -161,6 +161,8 @@ const struct dc_plane_status *dc_plane_get_status(break ; } +dc_exit_ips_for_hw_access (dc); +for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i];
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -2324,6 +2324,7 @@ bool dc_is_plane_eligible_for_idle_optimizations(struct dc *dc, struct dc_plane_ struct dc_cursor_attributes *cursor_attr);void dc_allow_idle_optimizations (struct dc *dc,bool allow); +void dc_exit_ips_for_hw_access (struct dc *dc);bool dc_dmub_is_ips_idle_state (struct dc *dc);/* set min and max memory clock to lowest and highest DPM level, respectively */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 228/399 btrfs: add set_folio_extent_mapped() helper
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit dfba9f47730604a46c284f6099a11c5686b6289d ]
Turn set_page_extent_mapped() into a wrapper around this version. Saves a call to compound_head() for callers who already have a folio and removes a couple of users of page->mapping.
Stable-dep-of: 86211eea8ae1 ("btrfs: qgroup: validate btrfs_qgroup_inherit parameter")
--- fs/btrfs/extent_io.c | 12 ++++++++---- fs/btrfs/extent_io.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)
fs/btrfs/extent_io.c +8 -4
@@ -936,17 +936,21 @@ static int attach_extent_buffer_folio(struct extent_buffer *eb,int set_page_extent_mapped (struct page *page) { -struct folio *folio =page_folio (page); +return set_folio_extent_mapped (page_folio (page)); +} + +int set_folio_extent_mapped (struct folio *folio) +{struct btrfs_fs_info *fs_info; -ASSERT (page->mapping); +ASSERT (folio->mapping);if (folio_test_private (folio))return 0 ; - fs_info =btrfs_sb (page->mapping->host->i_sb); + fs_info =btrfs_sb (folio->mapping->host->i_sb); -if (btrfs_is_subpage (fs_info, page->mapping)) +if (btrfs_is_subpage (fs_info, folio->mapping))return btrfs_attach_subpage (fs_info, folio,BTRFS_SUBPAGE_DATA );folio_attach_private (folio, (void *)EXTENT_FOLIO_PRIVATE );
fs/btrfs/extent_io.h +1 -0
@@ -221,6 +221,7 @@ int btree_write_cache_pages(struct address_space *mapping,void extent_readahead (struct readahead_control *rac);int extent_fiemap (struct btrfs_inode *inode,struct fiemap_extent_info *fieinfo,u64 start,u64 len); +int set_folio_extent_mapped (struct folio *folio);int set_page_extent_mapped (struct page *page);void clear_page_extent_mapped (struct page *page);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 229/399 btrfs: replace sb::s_blocksize by fs_info::sectorsize
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Sterba <[email protected]>
[ Upstream commit 4e00422ee62663e31e611d7de4d2c4aa3f8555f2 ]
The block size stored in the super block is used by subsystems outside of btrfs and it's a copy of fs_info::sectorsize. Unify that to always use our sectorsize, with the exception of mount where we first need to use fixed values (4K) until we read the super block and can set the sectorsize.
Replace all uses, in most cases it's fewer pointer indirections.
Stable-dep-of: 86211eea8ae1 ("btrfs: qgroup: validate btrfs_qgroup_inherit parameter")
--- fs/btrfs/disk-io.c | 2 ++ fs/btrfs/extent_io.c | 4 ++-- fs/btrfs/inode.c | 2 +- fs/btrfs/ioctl.c | 2 +- fs/btrfs/reflink.c | 6 +++--- fs/btrfs/send.c | 2 +- fs/btrfs/super.c | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-)
fs/btrfs/disk-io.c +2 -0
@@ -2839,6 +2839,7 @@ static int init_mount_fs_info(struct btrfs_fs_info *fs_info, struct super_blockint ret; fs_info->sb = sb; +/* Temporary fixed values for block size until we read the superblock. */ sb->s_blocksize =BTRFS_BDEV_BLOCKSIZE ; sb->s_blocksize_bits =blksize_bits (BTRFS_BDEV_BLOCKSIZE );
@@ -3356,6 +3357,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device sb->s_bdi->ra_pages *=btrfs_super_num_devices (disk_super); sb->s_bdi->ra_pages =max (sb->s_bdi->ra_pages,SZ_4M /PAGE_SIZE ); +/* Update the values for the current filesystem. */ sb->s_blocksize = sectorsize; sb->s_blocksize_bits =blksize_bits (sectorsize);memcpy (&sb->s_uuid, fs_info->fs_devices->fsid,BTRFS_FSID_SIZE );
fs/btrfs/extent_io.c +2 -2
@@ -1022,7 +1022,7 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,int ret =0 ;size_t pg_offset =0 ;size_t iosize; -size_t blocksize = inode->i_sb->s_blocksize; +size_t blocksize = fs_info->sectorsize;struct extent_io_tree *tree = &BTRFS_I (inode)->io_tree; ret =set_page_extent_mapped (page);
@@ -2313,7 +2313,7 @@ int extent_invalidate_folio(struct extent_io_tree *tree,struct extent_state *cached_state =NULL ;u64 start =folio_pos (folio);u64 end = start +folio_size (folio) -1 ; -size_t blocksize = folio->mapping->host->i_sb->s_blocksize; +size_t blocksize =btrfs_sb (folio->mapping->host->i_sb)->sectorsize;/* This function is only called for the btree inode */ ASSERT (tree->owner ==IO_TREE_BTREE_INODE_IO );
fs/btrfs/inode.c +1 -1
@@ -8723,7 +8723,7 @@ static int btrfs_getattr(struct mnt_idmap *idmap,u64 delalloc_bytes;u64 inode_bytes;struct inode *inode =d_inode (path->dentry); -u32 blocksize = inode->i_sb->s_blocksize; +u32 blocksize =btrfs_sb (inode->i_sb)->sectorsize;u32 bi_flags =BTRFS_I (inode)->flags;u32 bi_ro_flags =BTRFS_I (inode)->ro_flags;
fs/btrfs/ioctl.c +1 -1
@@ -528,7 +528,7 @@ static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info,* block group is in the logical address space, which can be any * sectorsize aligned bytenr in the range [0, U64_MAX]. */ -if (range.len < fs_info->sb->s_blocksize) +if (range.len < fs_info->sectorsize)return -EINVAL ; range.minlen =max (range.minlen, minlen);
fs/btrfs/reflink.c +3 -3
@@ -663,7 +663,7 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, struct inode *dst, u64 dst_loff) {struct btrfs_fs_info *fs_info =BTRFS_I (src)->root->fs_info; -const u64 bs = fs_info->sb->s_blocksize; +const u64 bs = fs_info->sectorsize;int ret;/*
@@ -730,7 +730,7 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src,int ret;int wb_ret;u64 len = olen; -u64 bs = fs_info->sb->s_blocksize; +u64 bs = fs_info->sectorsize;/* * VFS's generic_remap_file_range_prep() protects us from cloning the
@@ -796,7 +796,7 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in, {struct inode *inode_in =file_inode (file_in);struct inode *inode_out =file_inode (file_out); -u64 bs =BTRFS_I (inode_out)->root->fs_info->sb->s_blocksize; +u64 bs =BTRFS_I (inode_out)->root->fs_info->sectorsize;u64 wb_len;int ret;
fs/btrfs/send.c +1 -1
@@ -6140,7 +6140,7 @@ static int send_write_or_clone(struct send_ctx *sctx,int ret =0 ;u64 offset = key->offset;u64 end; -u64 bs = sctx->send_root->fs_info->sb->s_blocksize; +u64 bs = sctx->send_root->fs_info->sectorsize; end =min_t (u64,btrfs_file_extent_end (path), sctx->cur_inode_size);if (offset >= end)
fs/btrfs/super.c +1 -1
@@ -1767,7 +1767,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_bavail =0 ; buf->f_type =BTRFS_SUPER_MAGIC ; - buf->f_bsize = dentry->d_sb->s_blocksize; + buf->f_bsize = fs_info->sectorsize; buf->f_namelen =BTRFS_NAME_LEN ;/* We treat it as constant endianness (it doesn't matter _which_)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 230/399 btrfs: add helpers to get inode from page/folio pointers
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Sterba <[email protected]>
[ Upstream commit c8293894afa718653688b2fa98ab68317c875a00 ]
Add convenience helpers to get a struct btrfs_inode from a page or folio pointer instead of open coding the chain or intermediate BTRFS_I. This is implemented as a macro (still with type checking) so we don't need full definitions of struct page or address_space.
Stable-dep-of: 86211eea8ae1 ("btrfs: qgroup: validate btrfs_qgroup_inherit parameter")
--- fs/btrfs/disk-io.c | 3 ++- fs/btrfs/extent_io.c | 8 ++++---- fs/btrfs/fs.h | 5 +++++ fs/btrfs/inode.c | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-)
fs/btrfs/disk-io.c +2 -1
@@ -529,7 +529,8 @@ static void btree_invalidate_folio(struct folio *folio, size_t offset, size_t length) {struct extent_io_tree *tree; - tree = &BTRFS_I (folio->mapping->host)->io_tree; + + tree = &folio_to_inode (folio)->io_tree;extent_invalidate_folio (tree, folio, offset);btree_release_folio (folio,GFP_NOFS );if (folio_get_private (folio)) {
fs/btrfs/extent_io.c +4 -4
@@ -827,7 +827,7 @@ static void submit_extent_page(struct btrfs_bio_ctrl *bio_ctrl, u64 disk_bytenr, struct page *page, size_t size, unsigned long pg_offset) { - struct btrfs_inode *inode = BTRFS_I(page->mapping->host); + struct btrfs_inode *inode = page_to_inode(page);ASSERT (pg_offset + size <=PAGE_SIZE );ASSERT (bio_ctrl->end_io_func);
@@ -1161,7 +1161,7 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,int btrfs_read_folio (struct file *file,struct folio *folio) {struct page *page = &folio->page; -struct btrfs_inode *inode =BTRFS_I (page->mapping->host); +struct btrfs_inode *inode =page_to_inode (page);u64 start =page_offset (page);u64 end = start +PAGE_SIZE -1 ;struct btrfs_bio_ctrl bio_ctrl = { .opf =REQ_OP_READ };
@@ -1184,7 +1184,7 @@ static inline void contiguous_readpages(struct page *pages[], int nr_pages,struct btrfs_bio_ctrl *bio_ctrl, u64 *prev_em_start) { - struct btrfs_inode *inode = BTRFS_I(pages[0]->mapping->host); + struct btrfs_inode *inode = page_to_inode(pages[0]);int index;btrfs_lock_and_flush_ordered_range (inode, start, end,NULL );
@@ -2382,7 +2382,7 @@ int try_release_extent_mapping(struct page *page, gfp_t mask)struct extent_map *em;u64 start =page_offset (page);u64 end = start +PAGE_SIZE -1 ; -struct btrfs_inode *btrfs_inode =BTRFS_I (page->mapping->host); +struct btrfs_inode *btrfs_inode =page_to_inode (page);struct extent_io_tree *tree = &btrfs_inode->io_tree;struct extent_map_tree *map = &btrfs_inode->extent_tree;
fs/btrfs/fs.h +5 -0
@@ -829,6 +829,11 @@ struct btrfs_fs_info {#endif }; +#define page_to_inode (_page) (BTRFS_I(_Generic((_page), \ + struct page *: (_page))->mapping->host)) +#define folio_to_inode (_folio) (BTRFS_I(_Generic((_folio), \ + struct folio *: (_folio))->mapping->host)) +static inline u64 btrfs_get_fs_generation (const struct btrfs_fs_info *fs_info) {return READ_ONCE (fs_info->generation);
fs/btrfs/inode.c +1 -1
@@ -7970,7 +7970,7 @@ static int btrfs_migrate_folio(struct address_space *mapping,static void btrfs_invalidate_folio (struct folio *folio,size_t offset,size_t length) { -struct btrfs_inode *inode =BTRFS_I (folio->mapping->host); +struct btrfs_inode *inode =folio_to_inode (folio);struct btrfs_fs_info *fs_info = inode->root->fs_info;struct extent_io_tree *tree = &inode->io_tree;struct extent_state *cached_state =NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 231/399 btrfs: add helpers to get fs_info from page/folio pointers
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Sterba <[email protected]>
[ Upstream commit b33d2e535f9b2a1c4210cfc4843ac0dbacbeebcc ]
Add convenience helpers to get a fs_info from a page or folio pointer instead of open coding the chain or using btrfs_sb() that in some cases does one more pointer hop. This is implemented as a macro (still with type checking) so we don't need full definitions of struct page, folio, btrfs_root and btrfs_fs_info. The latter can't be static inlines as this would create loop between ctree.h <-> fs.h, or the headers would have to be restructured.
Stable-dep-of: 86211eea8ae1 ("btrfs: qgroup: validate btrfs_qgroup_inherit parameter")
--- fs/btrfs/compression.c | 2 +- fs/btrfs/disk-io.c | 2 +- fs/btrfs/extent_io.c | 16 ++++++++-------- fs/btrfs/fs.h | 3 +++ fs/btrfs/inode.c | 2 +- fs/btrfs/lzo.c | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-)
fs/btrfs/compression.c +1 -1
@@ -1039,7 +1039,7 @@ static int btrfs_decompress_bio(struct compressed_bio *cb)int btrfs_decompress (int type,const u8 *data_in,struct page *dest_page,unsigned long dest_pgoff,size_t srclen,size_t destlen) { -struct btrfs_fs_info *fs_info =btrfs_sb (dest_page->mapping->host->i_sb); +struct btrfs_fs_info *fs_info =page_to_fs_info (dest_page);struct list_head *workspace;const u32 sectorsize = fs_info->sectorsize;int ret;
fs/btrfs/disk-io.c +1 -1
@@ -534,7 +534,7 @@ static void btree_invalidate_folio(struct folio *folio, size_t offset,extent_invalidate_folio (tree, folio, offset);btree_release_folio (folio,GFP_NOFS );if (folio_get_private (folio)) { -btrfs_warn (BTRFS_I (folio->mapping->host)->root->fs_info, +btrfs_warn (folio_to_fs_info (folio),"folio private not zero on folio %llu" , (unsigned long long )folio_pos (folio));folio_detach_private (folio);
fs/btrfs/extent_io.c +8 -8
@@ -433,7 +433,7 @@ static bool btrfs_verify_page(struct page *page, u64 start)static void end_page_read (struct page *page,bool uptodate,u64 start,u32 len) { -struct btrfs_fs_info *fs_info =btrfs_sb (page->mapping->host->i_sb); +struct btrfs_fs_info *fs_info =page_to_fs_info (page);struct folio *folio =page_folio (page); ASSERT(page_offset(page) <= start &&
@@ -948,7 +948,7 @@ int set_folio_extent_mapped(struct folio *folio)if (folio_test_private (folio))return 0 ; - fs_info =btrfs_sb (folio->mapping->host->i_sb); + fs_info =folio_to_fs_info (folio);if (btrfs_is_subpage (fs_info, folio->mapping))return btrfs_attach_subpage (fs_info, folio,BTRFS_SUBPAGE_DATA );
@@ -967,7 +967,7 @@ void clear_page_extent_mapped(struct page *page)if (!folio_test_private (folio))return ; - fs_info =btrfs_sb (page->mapping->host->i_sb); + fs_info =page_to_fs_info (page);if (btrfs_is_subpage (fs_info, page->mapping))return btrfs_detach_subpage (fs_info, folio);
@@ -1770,7 +1770,7 @@ static noinline_for_stack void write_one_eb(struct extent_buffer *eb,*/ static int submit_eb_subpage (struct page *page,struct writeback_control *wbc) { -struct btrfs_fs_info *fs_info =btrfs_sb (page->mapping->host->i_sb); +struct btrfs_fs_info *fs_info =page_to_fs_info (page);struct folio *folio =page_folio (page);int submitted =0 ;u64 page_start =page_offset (page);
@@ -1861,7 +1861,7 @@ static int submit_eb_page(struct page *page, struct btrfs_eb_write_context *ctx)if (!folio_test_private (folio))return 0 ; -if (btrfs_sb (page->mapping->host->i_sb)->nodesize <PAGE_SIZE ) +if (page_to_fs_info (page)->nodesize <PAGE_SIZE )return submit_eb_subpage (page, wbc);spin_lock (&mapping->i_private_lock);
@@ -2313,7 +2313,7 @@ int extent_invalidate_folio(struct extent_io_tree *tree,struct extent_state *cached_state =NULL ;u64 start =folio_pos (folio);u64 end = start +folio_size (folio) -1 ; -size_t blocksize =btrfs_sb (folio->mapping->host->i_sb)->sectorsize; +size_t blocksize =folio_to_fs_info (folio)->sectorsize;/* This function is only called for the btree inode */ ASSERT (tree->owner ==IO_TREE_BTREE_INODE_IO );
@@ -4940,7 +4940,7 @@ static struct extent_buffer *get_next_extent_buffer(static int try_release_subpage_extent_buffer (struct page *page) { -struct btrfs_fs_info *fs_info =btrfs_sb (page->mapping->host->i_sb); +struct btrfs_fs_info *fs_info =page_to_fs_info (page);u64 cur =page_offset (page);const u64 end =page_offset (page) +PAGE_SIZE ;int ret;
@@ -5013,7 +5013,7 @@ int try_release_extent_buffer(struct page *page)struct folio *folio =page_folio (page);struct extent_buffer *eb; -if (btrfs_sb (page->mapping->host->i_sb)->nodesize <PAGE_SIZE ) +if (page_to_fs_info (page)->nodesize <PAGE_SIZE )return try_release_subpage_extent_buffer (page);/*
fs/btrfs/fs.h +3 -0
@@ -834,6 +834,9 @@ struct btrfs_fs_info {#define folio_to_inode (_folio) (BTRFS_I(_Generic((_folio), \ struct folio *: (_folio))->mapping->host)) +#define page_to_fs_info (_page) (page_to_inode(_page)->root->fs_info) +#define folio_to_fs_info (_folio) (folio_to_inode(_folio)->root->fs_info) +static inline u64 btrfs_get_fs_generation (const struct btrfs_fs_info *fs_info) {return READ_ONCE (fs_info->generation);
fs/btrfs/inode.c +1 -1
@@ -7903,7 +7903,7 @@ static void btrfs_readahead(struct readahead_control *rac)*/ static void wait_subpage_spinlock (struct page *page) { -struct btrfs_fs_info *fs_info =btrfs_sb (page->mapping->host->i_sb); +struct btrfs_fs_info *fs_info =page_to_fs_info (page);struct folio *folio =page_folio (page);struct btrfs_subpage *subpage;
fs/btrfs/lzo.c +1 -1
@@ -429,7 +429,7 @@ int lzo_decompress(struct list_head *ws, const u8 *data_in, size_t destlen) { struct workspace *workspace = list_entry(ws, struct workspace, list); -struct btrfs_fs_info *fs_info =btrfs_sb (dest_page->mapping->host->i_sb); +struct btrfs_fs_info *fs_info =page_to_fs_info (dest_page);const u32 sectorsize = fs_info->sectorsize;size_t in_len;size_t out_len;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 232/399 btrfs: add helper to get fs_info from struct inode pointer
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Sterba <[email protected]>
[ Upstream commit 41044b41ad2c8c8165a42ec6e9a4096826dcf153 ]
Add a convenience helper to get a fs_info from a VFS inode pointer instead of open coding the chain or using btrfs_sb() that in some cases does one more pointer hop. This is implemented as a macro (still with type checking) so we don't need full definitions of struct btrfs_inode, btrfs_root or btrfs_fs_info.
Stable-dep-of: 86211eea8ae1 ("btrfs: qgroup: validate btrfs_qgroup_inherit parameter")
--- fs/btrfs/compression.c | 6 +++--- fs/btrfs/defrag.c | 4 ++-- fs/btrfs/disk-io.c | 6 +++--- fs/btrfs/export.c | 2 +- fs/btrfs/extent_io.c | 12 +++++------ fs/btrfs/file.c | 14 ++++++------- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/fs.h | 3 +++ fs/btrfs/inode.c | 39 ++++++++++++++++++------------------ fs/btrfs/ioctl.c | 40 ++++++++++++++++++------------------- fs/btrfs/lzo.c | 2 +- fs/btrfs/props.c | 2 +- fs/btrfs/reflink.c | 6 +++--- fs/btrfs/relocation.c | 2 +- 14 files changed, 72 insertions(+), 68 deletions(-)
fs/btrfs/compression.c +3 -3
@@ -284,7 +284,7 @@ static void end_bbio_comprssed_read(struct btrfs_bio *bbio) static noinline void end_compressed_writeback(const struct compressed_bio *cb) {struct inode *inode = &cb->bbio.inode->vfs_inode; -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);unsigned long index = cb->start >>PAGE_SHIFT ;unsigned long end_index = (cb->start + cb->len -1 ) >>PAGE_SHIFT ;struct folio_batch fbatch;
@@ -415,7 +415,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,struct compressed_bio *cb, int *memstall, unsigned long *pflags) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);unsigned long end_index;struct bio *orig_bio = &cb->orig_bbio->bio;u64 cur = cb->orig_bbio->file_offset + orig_bio->bi_iter.bi_size;
@@ -441,7 +441,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,* This makes readahead less effective, so here disable readahead for * subpage for now, until full compressed write is supported. */ -if (btrfs_sb (inode->i_sb)->sectorsize <PAGE_SIZE ) +if (fs_info->sectorsize <PAGE_SIZE )return 0 ; end_index = (i_size_read (inode) -1 ) >>PAGE_SHIFT ;
fs/btrfs/defrag.c +2 -2
@@ -810,7 +810,7 @@ static u32 get_extent_max_capacity(const struct btrfs_fs_info *fs_info,static bool defrag_check_next_extent (struct inode *inode,struct extent_map *em,u32 extent_thresh,u64 newer_than,bool locked) { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct extent_map *next;bool ret = false;
@@ -1366,7 +1366,7 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_to_defrag) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);unsigned long sectors_defragged =0 ;u64 isize =i_size_read (inode);u64 cur;
fs/btrfs/disk-io.c +3 -3
@@ -498,15 +498,15 @@ static int btree_migrate_folio(struct address_space *mapping,static int btree_writepages (struct address_space *mapping,struct writeback_control *wbc) { -struct btrfs_fs_info *fs_info;int ret;if (wbc->sync_mode ==WB_SYNC_NONE ) { +struct btrfs_fs_info *fs_info;if (wbc->for_kupdate)return 0 ; - fs_info =BTRFS_I (mapping->host)->root->fs_info; + fs_info =inode_to_fs_info (mapping->host);/* this is a bit racy, but that's ok */ ret = __percpu_counter_compare(&fs_info->dirty_metadata_bytes, BTRFS_DIRTY_METADATA_THRESH,
@@ -545,7 +545,7 @@ static void btree_invalidate_folio(struct folio *folio, size_t offset,static bool btree_dirty_folio (struct address_space *mapping,struct folio *folio) { -struct btrfs_fs_info *fs_info =btrfs_sb (mapping->host->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (mapping->host);struct btrfs_subpage_info *spi = fs_info->subpage_info;struct btrfs_subpage *subpage;struct extent_buffer *eb;
fs/btrfs/export.c +1 -1
@@ -215,7 +215,7 @@ static int btrfs_get_name(struct dentry *parent, char *name, {struct inode *inode =d_inode (child);struct inode *dir =d_inode (parent); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_path *path;struct btrfs_root *root =BTRFS_I (dir)->root;struct btrfs_inode_ref *iref;
fs/btrfs/extent_io.c +6 -6
@@ -207,7 +207,7 @@ static void __process_pages_contig(struct address_space *mapping, struct page *locked_page, u64 start, u64 end, unsigned long page_ops) { - struct btrfs_fs_info *fs_info = btrfs_sb(mapping->host->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(mapping->host);pgoff_t start_index = start >>PAGE_SHIFT ;pgoff_t end_index = end >>PAGE_SHIFT ;pgoff_t index = start_index;
@@ -251,7 +251,7 @@ static noinline int lock_delalloc_pages(struct inode *inode, u64 start, u64 end) { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct address_space *mapping = inode->i_mapping;pgoff_t start_index = start >>PAGE_SHIFT ;pgoff_t end_index = end >>PAGE_SHIFT ;
@@ -323,7 +323,7 @@ noinline_for_stack bool find_lock_delalloc_range(struct inode *inode, struct page *locked_page, u64 *start, u64 *end) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);struct extent_io_tree *tree = &BTRFS_I (inode)->io_tree;const u64 orig_start = *start;const u64 orig_end = *end;
@@ -1011,7 +1011,7 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached, struct btrfs_bio_ctrl *bio_ctrl, u64 *prev_em_start) { struct inode *inode = page->mapping->host; -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);u64 start =page_offset (page);const u64 end = start +PAGE_SIZE -1 ;u64 cur = start;
@@ -1919,7 +1919,7 @@ int btree_write_cache_pages(struct address_space *mapping, struct writeback_control *wbc) {struct btrfs_eb_write_context ctx = { .wbc = wbc }; -struct btrfs_fs_info *fs_info =BTRFS_I (mapping->host)->root->fs_info; +struct btrfs_fs_info *fs_info =inode_to_fs_info (mapping->host);int ret =0 ;int done =0 ;int nr_to_write_done =0 ;
@@ -2207,7 +2207,7 @@ void extent_write_locked_range(struct inode *inode, struct page *locked_page,bool found_error = false;int ret =0 ;struct address_space *mapping = inode->i_mapping; -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);const u32 sectorsize = fs_info->sectorsize;loff_t i_size =i_size_read (inode);u64 cur = start;
fs/btrfs/file.c +7 -7
@@ -1137,7 +1137,7 @@ static int btrfs_write_check(struct kiocb *iocb, struct iov_iter *from, {struct file *file = iocb->ki_filp;struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);loff_t pos = iocb->ki_pos;int ret;loff_t oldsize;
@@ -1185,7 +1185,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,struct file *file = iocb->ki_filp;loff_t pos;struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct page **pages =NULL ;struct extent_changeset *data_reserved =NULL ;u64 release_bytes =0 ;
@@ -1461,7 +1461,7 @@ static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from) {struct file *file = iocb->ki_filp;struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);loff_t pos;ssize_t written =0 ;ssize_t written_buffered;
@@ -1787,7 +1787,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) {struct dentry *dentry =file_dentry (file);struct inode *inode =d_inode (dentry); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_trans_handle *trans;struct btrfs_log_ctx ctx;
@@ -2593,7 +2593,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,static int btrfs_punch_hole (struct file *file,loff_t offset,loff_t len) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct extent_state *cached_state =NULL ;struct btrfs_path *path;
@@ -3049,7 +3049,7 @@ static long btrfs_fallocate(struct file *file, int mode,int ret;/* Do not allow fallocate in ZONED mode */ -if (btrfs_is_zoned (btrfs_sb (inode->i_sb))) +if (btrfs_is_zoned (inode_to_fs_info (inode)))return -EOPNOTSUPP ; alloc_start =round_down (offset, blocksize);
@@ -3754,7 +3754,7 @@ static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to)if (fsverity_active (inode))return 0 ; -if (check_direct_read (btrfs_sb (inode->i_sb), to, iocb->ki_pos)) +if (check_direct_read (inode_to_fs_info (inode), to, iocb->ki_pos))return 0 ;btrfs_inode_lock (BTRFS_I (inode),BTRFS_ILOCK_SHARED );
fs/btrfs/free-space-cache.c +1 -1
@@ -399,7 +399,7 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,return -ENOMEM ; io_ctl->num_pages = num_pages; - io_ctl->fs_info =btrfs_sb (inode->i_sb); + io_ctl->fs_info =inode_to_fs_info (inode); io_ctl->inode = inode;return 0 ;
fs/btrfs/fs.h +3 -0
@@ -837,6 +837,9 @@ struct btrfs_fs_info {#define page_to_fs_info (_page) (page_to_inode(_page)->root->fs_info)#define folio_to_fs_info (_folio) (folio_to_inode(_folio)->root->fs_info) +#define inode_to_fs_info (_inode) (BTRFS_I(_Generic((_inode), \ + struct inode *: (_inode)))->root->fs_info) +static inline u64 btrfs_get_fs_generation (const struct btrfs_fs_info *fs_info) {return READ_ONCE (fs_info->generation);
fs/btrfs/inode.c +20 -19
@@ -2829,7 +2829,7 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)int btrfs_writepage_cow_fixup (struct page *page) {struct inode *inode = page->mapping->host; -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_writepage_fixup *fixup;/* This page has ordered extent covering it already */
@@ -3254,7 +3254,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)int btrfs_finish_ordered_io (struct btrfs_ordered_extent *ordered) { -if (btrfs_is_zoned (btrfs_sb (ordered->inode->i_sb)) && +if (btrfs_is_zoned (inode_to_fs_info (ordered->inode)) && !test_bit (BTRFS_ORDERED_IOERR , &ordered->flags) &&list_empty (&ordered->bioc_list))btrfs_finish_ordered_zoned (ordered);
@@ -3739,7 +3739,7 @@ static noinline int acls_after_inode_item(struct extent_buffer *leaf,static int btrfs_read_locked_inode (struct inode *inode,struct btrfs_path *in_path) { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_path *path = in_path;struct extent_buffer *leaf;struct btrfs_inode_item *inode_item;
@@ -4464,8 +4464,8 @@ static void btrfs_prune_dentries(struct btrfs_root *root)int btrfs_delete_subvolume (struct btrfs_inode *dir,struct dentry *dentry) { -struct btrfs_fs_info *fs_info =btrfs_sb (dentry->d_sb);struct btrfs_root *root = dir->root; +struct btrfs_fs_info *fs_info = root->fs_info;struct inode *inode =d_inode (dentry);struct btrfs_root *dest =BTRFS_I (inode)->root;struct btrfs_trans_handle *trans;
@@ -5019,7 +5019,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)btrfs_drew_write_unlock (&root->snapshot_lock);btrfs_end_transaction (trans); }else { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);if (btrfs_is_zoned (fs_info)) { ret = btrfs_wait_ordered_range(inode,
@@ -5222,7 +5222,7 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root,void btrfs_evict_inode (struct inode *inode) { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info;struct btrfs_trans_handle *trans;struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_block_rsv *rsv =NULL ;
@@ -5236,6 +5236,7 @@ void btrfs_evict_inode(struct inode *inode)return ; } + fs_info =inode_to_fs_info (inode);evict_inode_truncate_pages (inode); if (inode->i_nlink &&
@@ -5661,7 +5662,7 @@ static inline u8 btrfs_inode_type(struct inode *inode)struct inode *btrfs_lookup_dentry (struct inode *dir,struct dentry *dentry) { -struct btrfs_fs_info *fs_info =btrfs_sb (dir->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (dir);struct inode *inode;struct btrfs_root *root =BTRFS_I (dir)->root;struct btrfs_root *sub_root = root;
@@ -6200,7 +6201,7 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,struct inode *dir = args->dir;struct inode *inode = args->inode;const struct fscrypt_str *name = args->orphan ?NULL : &args->fname.disk_name; -struct btrfs_fs_info *fs_info =btrfs_sb (dir->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (dir);struct btrfs_root *root;struct btrfs_inode_item *inode_item;struct btrfs_key *location;
@@ -6522,7 +6523,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,static int btrfs_create_common (struct inode *dir,struct dentry *dentry,struct inode *inode) { -struct btrfs_fs_info *fs_info =btrfs_sb (dir->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (dir);struct btrfs_root *root =BTRFS_I (dir)->root;struct btrfs_new_inode_args new_inode_args = { .dir = dir,
@@ -6592,7 +6593,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,struct btrfs_trans_handle *trans =NULL ;struct btrfs_root *root =BTRFS_I (dir)->root;struct inode *inode =d_inode (old_dentry); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct fscrypt_name fname;u64 index;int err;
@@ -7078,7 +7079,7 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, u64 *orig_start, u64 *orig_block_len, u64 *ram_bytes, bool nowait, bool strict) { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct can_nocow_file_extent_args nocow_args = {0 };struct btrfs_path *path;int ret;
@@ -7317,7 +7318,7 @@ static int btrfs_get_blocks_direct_write(struct extent_map **map, unsigned int iomap_flags) {const bool nowait = (iomap_flags &IOMAP_NOWAIT ); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct extent_map *em = *map;int type;u64 block_start, orig_start, orig_block_len, ram_bytes;
@@ -7457,7 +7458,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start, struct iomap *srcmap) { struct iomap_iter *iter = container_of(iomap, struct iomap_iter, iomap); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct extent_map *em;struct extent_state *cached_state =NULL ;struct btrfs_dio_data *dio_data = iter->private;
@@ -8154,7 +8155,7 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)struct page *page = vmf->page;struct folio *folio =page_folio (page);struct inode *inode =file_inode (vmf->vma->vm_file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct extent_io_tree *io_tree = &BTRFS_I (inode)->io_tree;struct btrfs_ordered_extent *ordered;struct extent_state *cached_state =NULL ;
@@ -8763,7 +8764,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,struct inode *new_dir, struct dentry *new_dentry) { - struct btrfs_fs_info *fs_info = btrfs_sb(old_dir->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(old_dir);struct btrfs_trans_handle *trans;unsigned int trans_num_items;struct btrfs_root *root =BTRFS_I (old_dir)->root;
@@ -9015,7 +9016,7 @@ static int btrfs_rename(struct mnt_idmap *idmap, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) { - struct btrfs_fs_info *fs_info = btrfs_sb(old_dir->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(old_dir); struct btrfs_new_inode_args whiteout_args = { .dir = old_dir, .dentry = old_dentry,
@@ -9457,7 +9458,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,static int btrfs_symlink (struct mnt_idmap *idmap,struct inode *dir,struct dentry *dentry,const char *symname) { -struct btrfs_fs_info *fs_info =btrfs_sb (dir->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (dir);struct btrfs_trans_handle *trans;struct btrfs_root *root =BTRFS_I (dir)->root;struct btrfs_path *path;
@@ -9638,7 +9639,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode, loff_t actual_len, u64 *alloc_hint, struct btrfs_trans_handle *trans) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);struct extent_map *em;struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_key ins;
@@ -9790,7 +9791,7 @@ static int btrfs_permission(struct mnt_idmap *idmap,static int btrfs_tmpfile (struct mnt_idmap *idmap,struct inode *dir,struct file *file,umode_t mode) { -struct btrfs_fs_info *fs_info =btrfs_sb (dir->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (dir);struct btrfs_trans_handle *trans;struct btrfs_root *root =BTRFS_I (dir)->root;struct inode *inode;
fs/btrfs/ioctl.c +20 -20
@@ -247,7 +247,7 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry, struct fileattr *fa) { struct inode *inode = d_inode(dentry); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_inode *binode =BTRFS_I (inode);struct btrfs_root *root = binode->root;struct btrfs_trans_handle *trans;
@@ -584,7 +584,7 @@ static noinline int create_subvol(struct mnt_idmap *idmap, struct inode *dir, struct dentry *dentry, struct btrfs_qgroup_inherit *inherit) { - struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);struct btrfs_trans_handle *trans;struct btrfs_key key;struct btrfs_root_item *root_item;
@@ -776,7 +776,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, struct dentry *dentry, bool readonly, struct btrfs_qgroup_inherit *inherit) { - struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);struct inode *inode;struct btrfs_pending_snapshot *pending_snapshot;unsigned int trans_num_items;
@@ -962,7 +962,7 @@ static noinline int btrfs_mksubvol(const struct path *parent, struct btrfs_qgroup_inherit *inherit) {struct inode *dir =d_inode (parent->dentry); -struct btrfs_fs_info *fs_info =btrfs_sb (dir->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (dir);struct dentry *dentry;struct fscrypt_str name_str =FSTR_INIT ((char *)name, namelen);int error;
@@ -1097,7 +1097,7 @@ static noinline int btrfs_ioctl_resize(struct file *file, {BTRFS_DEV_LOOKUP_ARGS (args);struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);u64 new_size;u64 old_size;u64 devid =1 ;
@@ -1405,7 +1405,7 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file, static noinline int btrfs_ioctl_subvol_getflags(struct inode *inode,void __user *arg) { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;int ret =0 ;u64 flags =0 ;
@@ -1428,7 +1428,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file, void __user *arg) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_trans_handle *trans;u64 root_flags;
@@ -1675,7 +1675,7 @@ static noinline int search_ioctl(struct inode *inode, u64 *buf_size, char __user *ubuf) { -struct btrfs_fs_info *info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *info =inode_to_fs_info (inode);struct btrfs_root *root;struct btrfs_key key;struct btrfs_path *path;
@@ -2346,9 +2346,9 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, bool destroy_v2) {struct dentry *parent = file->f_path.dentry; -struct btrfs_fs_info *fs_info =btrfs_sb (parent->d_sb);struct dentry *dentry;struct inode *dir =d_inode (parent); +struct btrfs_fs_info *fs_info =inode_to_fs_info (dir);struct inode *inode;struct btrfs_root *root =BTRFS_I (dir)->root;struct btrfs_root *dest =NULL ;
@@ -2696,7 +2696,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) {BTRFS_DEV_LOOKUP_ARGS (args);struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_ioctl_vol_args_v2 *vol_args;struct bdev_handle *bdev_handle =NULL ;int ret;
@@ -2761,7 +2761,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg) {BTRFS_DEV_LOOKUP_ARGS (args);struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_ioctl_vol_args *vol_args;struct bdev_handle *bdev_handle =NULL ;int ret;
@@ -2904,7 +2904,7 @@ static long btrfs_ioctl_dev_info(struct btrfs_fs_info *fs_info,static long btrfs_ioctl_default_subvol (struct file *file,void __user *argp) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_root *new_root;struct btrfs_dir_item *di;
@@ -3178,7 +3178,7 @@ static noinline long btrfs_ioctl_wait_sync(struct btrfs_fs_info *fs_info,static long btrfs_ioctl_scrub (struct file *file,void __user *arg) { -struct btrfs_fs_info *fs_info =btrfs_sb (file_inode (file)->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (file_inode (file));struct btrfs_ioctl_scrub_args *sa;int ret;
@@ -3696,7 +3696,7 @@ static long btrfs_ioctl_balance_progress(struct btrfs_fs_info *fs_info,static long btrfs_ioctl_quota_ctl (struct file *file,void __user *arg) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_ioctl_quota_ctl_args *sa;int ret;
@@ -3738,7 +3738,7 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)static long btrfs_ioctl_qgroup_assign (struct file *file,void __user *arg) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_ioctl_qgroup_assign_args *sa;struct btrfs_trans_handle *trans;
@@ -3894,7 +3894,7 @@ static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg)static long btrfs_ioctl_quota_rescan (struct file *file,void __user *arg) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_ioctl_quota_rescan_args *qsa;int ret;
@@ -3958,7 +3958,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file, struct btrfs_ioctl_received_subvol_args *sa) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_root_item *root_item = &root->root_item;struct btrfs_trans_handle *trans;
@@ -4146,7 +4146,7 @@ static int btrfs_ioctl_get_fslabel(struct btrfs_fs_info *fs_info,static int btrfs_ioctl_set_fslabel (struct file *file,void __user *arg) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_super_block *super_block = fs_info->super_copy;struct btrfs_trans_handle *trans;
@@ -4289,7 +4289,7 @@ check_feature_bits(fs_info, FEAT_##mask_base, change_mask, flags, \static int btrfs_ioctl_set_features (struct file *file,void __user *arg) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_super_block *super_block = fs_info->super_copy;struct btrfs_ioctl_feature_flags flags[2 ];
@@ -4580,7 +4580,7 @@ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) {struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);struct btrfs_root *root =BTRFS_I (inode)->root;void __user *argp = (void __user *)arg;
fs/btrfs/lzo.c +1 -1
@@ -214,7 +214,7 @@ int lzo_compress_pages(struct list_head *ws, struct address_space *mapping, unsigned long *total_in, unsigned long *total_out) { struct workspace *workspace = list_entry(ws, struct workspace, list); -const u32 sectorsize =btrfs_sb (mapping->host->i_sb)->sectorsize; +const u32 sectorsize =inode_to_fs_info (mapping->host)->sectorsize;struct page *page_in =NULL ;char *sizes_ptr;const unsigned long max_nr_page = *out_pages;
fs/btrfs/props.c +1 -1
@@ -302,7 +302,7 @@ static int prop_compression_validate(const struct btrfs_inode *inode,static int prop_compression_apply (struct inode *inode,const char *value,size_t len) { -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);int type;/* Reset to defaults */
fs/btrfs/reflink.c +3 -3
@@ -174,7 +174,7 @@ static int clone_copy_inline_extent(struct inode *dst,char *inline_data, struct btrfs_trans_handle **trans_out) { - struct btrfs_fs_info *fs_info = btrfs_sb(dst->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(dst);struct btrfs_root *root =BTRFS_I (dst)->root;const u64 aligned_end =ALIGN (new_key->offset + datal, fs_info->sectorsize);
@@ -337,7 +337,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode, const u64 off, const u64 olen, const u64 olen_aligned, const u64 destoff, int no_time_update) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);struct btrfs_path *path =NULL ;struct extent_buffer *leaf;struct btrfs_trans_handle *trans;
@@ -726,7 +726,7 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, {struct inode *inode =file_inode (file);struct inode *src =file_inode (file_src); -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); +struct btrfs_fs_info *fs_info =inode_to_fs_info (inode);int ret;int wb_ret;u64 len = olen;
fs/btrfs/relocation.c +1 -1
@@ -2987,7 +2987,7 @@ static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,const struct file_extent_cluster *cluster, int *cluster_nr, unsigned long page_index) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);u64 offset =BTRFS_I (inode)->index_cnt;const unsigned long last_index = (cluster->end - offset) >>PAGE_SHIFT ;gfp_t mask =btrfs_alloc_write_mask (inode->i_mapping);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 233/399 btrfs: qgroup: validate btrfs_qgroup_inherit parameter
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 86211eea8ae1676cc819d2b4fdc8d995394be07d ]
[BUG]
Currently btrfs can create subvolume with an invalid qgroup inherit without triggering any error:
# mkfs.btrfs -O quota -f $dev # mount $dev $mnt # btrfs subvolume create -i 2/0 $mnt/subv1 # btrfs qgroup show -prce --sync $mnt Qgroupid Referenced Exclusive Path -------- ---------- --------- ---- 0/5 16.00KiB 16.00KiB <toplevel> 0/256 16.00KiB 16.00KiB subv1
[CAUSE]
We only do a very basic size check for btrfs_qgroup_inherit structure, but never really verify if the values are correct.
Thus in btrfs_qgroup_inherit() function, we have to skip non-existing qgroups, and never return any error.
[FIX]
Fix the behavior and introduce extra checks:
- Introduce early check for btrfs_qgroup_inherit structure Not only the size, but also all the qgroup ids would be verified.
And the timing is very early, so we can return error early. This early check is very important for snapshot creation, as snapshot is delayed to transaction commit.
- Drop support for btrfs_qgroup_inherit::num_ref_copies and num_excl_copies
Those two members are used to specify to copy refr/excl numbers from other qgroups.
This would definitely mark qgroup inconsistent, and btrfs-progs has dropped the support for them for a long time.
It's time to drop the support for kernel.
- Verify the supported btrfs_qgroup_inherit::flags
Just in case we want to add extra flags for btrfs_qgroup_inherit.
Now above subvolume creation would fail with -ENOENT other than silently ignore the non-existing qgroup.
--- fs/btrfs/ioctl.c | 16 +++--------- fs/btrfs/qgroup.c | 51 ++++++++++++++++++++++++++++++++++++++ fs/btrfs/qgroup.h | 3 +++ include/uapi/linux/btrfs.h | 1 + 4 files changed, 58 insertions(+), 13 deletions(-)
fs/btrfs/ioctl.c +3 -13
@@ -1362,7 +1362,7 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,if (vol_args->flags &BTRFS_SUBVOL_RDONLY ) readonly = true;if (vol_args->flags &BTRFS_SUBVOL_QGROUP_INHERIT ) { -u64 nums; +struct btrfs_fs_info *fs_info =inode_to_fs_info (file_inode (file));if (vol_args->size <sizeof (*inherit) || vol_args->size >PAGE_SIZE ) {
@@ -1375,19 +1375,9 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file, goto free_args; } -if (inherit->num_qgroups >PAGE_SIZE || - inherit->num_ref_copies >PAGE_SIZE || - inherit->num_excl_copies >PAGE_SIZE ) { - ret = -EINVAL ; - goto free_inherit; - } - - nums = inherit->num_qgroups +2 * inherit->num_ref_copies + -2 * inherit->num_excl_copies; -if (vol_args->size !=struct_size (inherit, qgroups, nums)) { - ret = -EINVAL ; + ret =btrfs_qgroup_check_inherit (fs_info, inherit, vol_args->size); +if (ret <0 ) goto free_inherit; - } } ret = __btrfs_ioctl_snap_create(file, file_mnt_idmap(file),
fs/btrfs/qgroup.c +51 -0
57 lines not on this page · raw message
fs/btrfs/qgroup.h +3 -0
@@ -341,6 +341,9 @@ int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr, struct ulist *new_roots);int btrfs_qgroup_account_extents (struct btrfs_trans_handle *trans);int btrfs_run_qgroups (struct btrfs_trans_handle *trans); +int btrfs_qgroup_check_inherit (struct btrfs_fs_info *fs_info, +struct btrfs_qgroup_inherit *inherit, +size_t size);int btrfs_qgroup_inherit (struct btrfs_trans_handle *trans,u64 srcid,u64 objectid,u64 inode_rootid,struct btrfs_qgroup_inherit *inherit);
include/uapi/linux/btrfs.h +1 -0
@@ -92,6 +92,7 @@ struct btrfs_qgroup_limit {* struct btrfs_qgroup_inherit.flags */ #define BTRFS_QGROUP_INHERIT_SET_LIMITS (1ULL << 0) +#define BTRFS_QGROUP_INHERIT_FLAGS_SUPP (BTRFS_QGROUP_INHERIT_SET_LIMITS)struct btrfs_qgroup_inherit {__u64 flags;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 234/399 vfio: Introduce interface to flush virqfd inject workqueue
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit b620ecbd17a03cacd06f014a5d3f3a11285ce053 ]
In order to synchronize changes that can affect the thread callback, introduce an interface to force a flush of the inject workqueue. The irqfd pointer is only valid under spinlock, but the workqueue cannot be flushed under spinlock. Therefore the flush work for the irqfd is queued under spinlock. The vfio_irqfd_cleanup_wq workqueue is re-used for queuing this work such that flushing the workqueue is also ordered relative to shutdown.
Stable-dep-of: 18c198c96a81 ("vfio/pci: Create persistent INTx handler")
--- drivers/vfio/virqfd.c | 21 +++++++++++++++++++++ include/linux/vfio.h | 2 ++ 2 files changed, 23 insertions(+)
drivers/vfio/virqfd.c +21 -0
@@ -101,6 +101,13 @@ static void virqfd_inject(struct work_struct *work) virqfd->thread (virqfd->opaque, virqfd->data); } +static void virqfd_flush_inject (struct work_struct *work) +{ + struct virqfd *virqfd = container_of(work, struct virqfd, flush_inject); + +flush_work (&virqfd->inject); +} + int vfio_virqfd_enable(void *opaque, int (*handler)(void *, void *), void (*thread)(void *, void *),
@@ -124,6 +131,7 @@ int vfio_virqfd_enable(void *opaque,INIT_WORK (&virqfd->shutdown, virqfd_shutdown);INIT_WORK (&virqfd->inject, virqfd_inject); +INIT_WORK (&virqfd->flush_inject, virqfd_flush_inject); irqfd =fdget (fd);if (!irqfd.file) {
@@ -213,3 +221,16 @@ void vfio_virqfd_disable(struct virqfd **pvirqfd)flush_workqueue (vfio_irqfd_cleanup_wq); }EXPORT_SYMBOL_GPL (vfio_virqfd_disable); + +void vfio_virqfd_flush_thread (struct virqfd **pvirqfd) +{ +unsigned long flags; + +spin_lock_irqsave (&virqfd_lock, flags); +if (*pvirqfd && (*pvirqfd)->thread) +queue_work (vfio_irqfd_cleanup_wq, &(*pvirqfd)->flush_inject); +spin_unlock_irqrestore (&virqfd_lock, flags); + +flush_workqueue (vfio_irqfd_cleanup_wq); +} +EXPORT_SYMBOL_GPL (vfio_virqfd_flush_thread);
include/linux/vfio.h +2 -0
@@ -356,6 +356,7 @@ struct virqfd {wait_queue_entry_t wait;poll_table pt;struct work_struct shutdown; +struct work_struct flush_inject;struct virqfd **pvirqfd; };
@@ -363,5 +364,6 @@ int vfio_virqfd_enable(void *opaque, int (*handler)(void *, void *), void (*thread)(void *, void *), void *data, struct virqfd **pvirqfd, int fd);void vfio_virqfd_disable (struct virqfd **pvirqfd); +void vfio_virqfd_flush_thread (struct virqfd **pvirqfd);#endif /* VFIO_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 235/399 vfio/pci: Create persistent INTx handler
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit 18c198c96a815c962adc2b9b77909eec0be7df4d ]
A vulnerability exists where the eventfd for INTx signaling can be deconfigured, which unregisters the IRQ handler but still allows eventfds to be signaled with a NULL context through the SET_IRQS ioctl or through unmask irqfd if the device interrupt is pending.
Ideally this could be solved with some additional locking; the igate mutex serializes the ioctl and config space accesses, and the interrupt handler is unregistered relative to the trigger, but the irqfd path runs asynchronous to those. The igate mutex cannot be acquired from the atomic context of the eventfd wake function. Disabling the irqfd relative to the eventfd registration is potentially incompatible with existing userspace.
As a result, the solution implemented here moves configuration of the INTx interrupt handler to track the lifetime of the INTx context object and irq_type configuration, rather than registration of a particular trigger eventfd. Synchronization is added between the ioctl path and eventfd_signal() wrapper such that the eventfd trigger can be dynamically updated relative to in-flight interrupts or irqfd callbacks.
--- drivers/vfio/pci/vfio_pci_intrs.c | 145 ++++++++++++++++-------------- 1 file changed, 78 insertions(+), 67 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +78 -67
@@ -90,11 +90,15 @@ static void vfio_send_intx_eventfd(void *opaque, void *unused)if (likely (is_intx (vdev) && !vdev->virq_disabled)) {struct vfio_pci_irq_ctx *ctx; +struct eventfd_ctx *trigger; ctx =vfio_irq_ctx_get (vdev,0 );if (WARN_ON_ONCE (!ctx))return ; -eventfd_signal (ctx->trigger); + + trigger =READ_ONCE (ctx->trigger); +if (likely (trigger)) +eventfd_signal (trigger); } }
@@ -253,100 +257,100 @@ static irqreturn_t vfio_intx_handler(int irq, void *dev_id)return ret; } -static int vfio_intx_enable (struct vfio_pci_core_device *vdev) +static int vfio_intx_enable (struct vfio_pci_core_device *vdev, +struct eventfd_ctx *trigger) { +struct pci_dev *pdev = vdev->pdev;struct vfio_pci_irq_ctx *ctx; +unsigned long irqflags; +char *name; +int ret;if (!is_irq_none (vdev))return -EINVAL ; -if (!vdev->pdev->irq) +if (!pdev->irq)return -ENODEV ; + name =kasprintf (GFP_KERNEL_ACCOUNT ,"vfio-intx(%s)" ,pci_name (pdev)); +if (!name) +return -ENOMEM ; + ctx =vfio_irq_ctx_alloc (vdev,0 );if (!ctx)return -ENOMEM ; + ctx->name = name; + ctx->trigger = trigger; +/* -* If the virtual interrupt is masked, restore it. Devices -* supporting DisINTx can be masked at the hardware level -* here, non-PCI-2.3 devices will have to wait until the -* interrupt is enabled. +* Fill the initial masked state based on virq_disabled. After +* enable, changing the DisINTx bit in vconfig directly changes INTx +* masking. igate prevents races during setup, once running masked +* is protected via irqlock. +* +* Devices supporting DisINTx also reflect the current mask state in +* the physical DisINTx bit, which is not affected during IRQ setup. +* +* Devices without DisINTx support require an exclusive interrupt. +* IRQ masking is performed at the IRQ chip. Again, igate protects +* against races during setup and IRQ handlers and irqfds are not +* yet active, therefore masked is stable and can be used to +* conditionally auto-enable the IRQ. +* +* irq_type must be stable while the IRQ handler is registered, +* therefore it must be set before request_irq(). */ ctx->masked = vdev->virq_disabled; -if (vdev->pci_2_3) -pci_intx (vdev->pdev, !ctx->masked); +if (vdev->pci_2_3) { +pci_intx (pdev, !ctx->masked); + irqflags =IRQF_SHARED ; + }else { + irqflags = ctx->masked ?IRQF_NO_AUTOEN :0 ; + } vdev->irq_type =VFIO_PCI_INTX_IRQ_INDEX ; + ret =request_irq (pdev->irq, vfio_intx_handler, + irqflags, ctx->name, vdev); +if (ret) { + vdev->irq_type =VFIO_PCI_NUM_IRQS ; +kfree (name); +vfio_irq_ctx_free (vdev, ctx,0 ); +return ret; + } +return 0 ; } -static int vfio_intx_set_signal (struct vfio_pci_core_device *vdev,int fd) +static int vfio_intx_set_signal (struct vfio_pci_core_device *vdev, +struct eventfd_ctx *trigger) {struct pci_dev *pdev = vdev->pdev; -unsigned long irqflags =IRQF_SHARED ;struct vfio_pci_irq_ctx *ctx; -struct eventfd_ctx *trigger; -unsigned long flags; -int ret; +struct eventfd_ctx *old; ctx =vfio_irq_ctx_get (vdev,0 );if (WARN_ON_ONCE (!ctx))return -EINVAL ; -if (ctx->trigger) { -free_irq (pdev->irq, vdev); -kfree (ctx->name); -eventfd_ctx_put (ctx->trigger); - ctx->trigger =NULL ; - } - -if (fd <0 )/* Disable only */ -return 0 ; - - ctx->name =kasprintf (GFP_KERNEL_ACCOUNT ,"vfio-intx(%s)" , -pci_name (pdev)); -if (!ctx->name) -return -ENOMEM ; - - trigger =eventfd_ctx_fdget (fd); -if (IS_ERR (trigger)) { -kfree (ctx->name); -return PTR_ERR (trigger); - } + old = ctx->trigger; - ctx->trigger = trigger; +WRITE_ONCE (ctx->trigger, trigger); -/* -* Devices without DisINTx support require an exclusive interrupt, -* IRQ masking is performed at the IRQ chip. The masked status is -* protected by vdev->irqlock. Setup the IRQ without auto-enable and -* unmask as necessary below under lock. DisINTx is unmodified by -* the IRQ configuration and may therefore use auto-enable. -*/ -if (!vdev->pci_2_3) - irqflags =IRQF_NO_AUTOEN ; - - ret =request_irq (pdev->irq, vfio_intx_handler, - irqflags, ctx->name, vdev); -if (ret) { - ctx->trigger =NULL ; -kfree (ctx->name); -eventfd_ctx_put (trigger); -return ret; +/* Releasing an old ctx requires synchronizing in-flight users */ +if (old) { +synchronize_irq (pdev->irq); +vfio_virqfd_flush_thread (&ctx->unmask); +eventfd_ctx_put (old); } -spin_lock_irqsave (&vdev->irqlock, flags); -if (!vdev->pci_2_3 && !ctx->masked) -enable_irq (pdev->irq); -spin_unlock_irqrestore (&vdev->irqlock, flags); -return 0 ; }static void vfio_intx_disable (struct vfio_pci_core_device *vdev) { +struct pci_dev *pdev = vdev->pdev;struct vfio_pci_irq_ctx *ctx; ctx =vfio_irq_ctx_get (vdev,0 );
@@ -354,10 +358,13 @@ static void vfio_intx_disable(struct vfio_pci_core_device *vdev)if (ctx) {vfio_virqfd_disable (&ctx->unmask);vfio_virqfd_disable (&ctx->mask); +free_irq (pdev->irq, vdev); +if (ctx->trigger) +eventfd_ctx_put (ctx->trigger); +kfree (ctx->name); +vfio_irq_ctx_free (vdev, ctx,0 ); } -vfio_intx_set_signal (vdev,-1 ); vdev->irq_type =VFIO_PCI_NUM_IRQS ; -vfio_irq_ctx_free (vdev, ctx,0 ); }/*
@@ -641,19 +648,23 @@ static int vfio_pci_set_intx_trigger(struct vfio_pci_core_device *vdev,return -EINVAL ;if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) { +struct eventfd_ctx *trigger =NULL ;int32_t fd = *(int32_t *)data;int ret; -if (is_intx (vdev)) -return vfio_intx_set_signal (vdev, fd); +if (fd >=0 ) { + trigger =eventfd_ctx_fdget (fd); +if (IS_ERR (trigger)) +return PTR_ERR (trigger); + } - ret =vfio_intx_enable (vdev); -if (ret) -return ret; +if (is_intx (vdev)) + ret =vfio_intx_set_signal (vdev, trigger); +else + ret =vfio_intx_enable (vdev, trigger); - ret =vfio_intx_set_signal (vdev, fd); -if (ret) -vfio_intx_disable (vdev); +if (ret && trigger) +eventfd_ctx_put (trigger);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 236/399 drm/bridge: add ->edid_read hook and drm_bridge_edid_read()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit d807ad80d811ba0c22adfd871e2a46491f80d6e2 ]
Add new struct drm_edid based ->edid_read hook and drm_bridge_edid_read() function to call the hook.
v2: Include drm/drm_edid.h
Stable-dep-of: 171b711b26cc ("drm/bridge: lt8912b: do not return negative values from .get_modes()")
--- drivers/gpu/drm/drm_bridge.c | 46 +++++++++++++++++++++++++++++++++++- include/drm/drm_bridge.h | 33 ++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_bridge.c +45 -1
@@ -27,8 +27,9 @@#include <linux/mutex.h> #include <drm/drm_atomic_state_helper.h> -#include <drm/drm_debugfs.h> #include <drm/drm_bridge.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_file.h> #include <drm/drm_of.h>
@@ -1206,6 +1207,47 @@ int drm_bridge_get_modes(struct drm_bridge *bridge, }EXPORT_SYMBOL_GPL (drm_bridge_get_modes); +/** +* drm_bridge_edid_read - read the EDID data of the connected display +* @bridge: bridge control structure +* @connector: the connector to read EDID for +* +* If the bridge supports output EDID retrieval, as reported by the +* DRM_BRIDGE_OP_EDID bridge ops flag, call &drm_bridge_funcs.edid_read to get +* the EDID and return it. Otherwise return NULL. +* +* If &drm_bridge_funcs.edid_read is not set, fall back to using +* drm_bridge_get_edid() and wrapping it in struct drm_edid. +* +* RETURNS: +* The retrieved EDID on success, or NULL otherwise. +*/ +const struct drm_edid *drm_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) +{ +if (!(bridge->ops &DRM_BRIDGE_OP_EDID )) +return NULL ; + +/* Transitional: Fall back to ->get_edid. */ +if (!bridge->funcs->edid_read) { +const struct drm_edid *drm_edid; +struct edid *edid; + + edid =drm_bridge_get_edid (bridge, connector); +if (!edid) +return NULL ; + + drm_edid =drm_edid_alloc (edid, (edid->extensions +1 ) *EDID_LENGTH ); + +kfree (edid); + +return drm_edid; + } + +return bridge->funcs->edid_read (bridge, connector); +} +EXPORT_SYMBOL_GPL (drm_bridge_edid_read); +/** * drm_bridge_get_edid - get the EDID data of the connected display * @bridge: bridge control structure
@@ -1215,6 +1257,8 @@ EXPORT_SYMBOL_GPL(drm_bridge_get_modes);* DRM_BRIDGE_OP_EDID bridge ops flag, call &drm_bridge_funcs.get_edid to * get the EDID and return it. Otherwise return NULL. * +* Deprecated. Prefer using drm_bridge_edid_read(). +* * RETURNS: * The retrieved EDID on success, or NULL otherwise. */
include/drm/drm_bridge.h +33 -0
@@ -557,6 +557,37 @@ struct drm_bridge_funcs {int (*get_modes)(struct drm_bridge *bridge,struct drm_connector *connector); +/** +* @edid_read: +* +* Read the EDID data of the connected display. +* +* The @edid_read callback is the preferred way of reporting mode +* information for a display connected to the bridge output. Bridges +* that support reading EDID shall implement this callback and leave +* the @get_modes callback unimplemented. +* +* The caller of this operation shall first verify the output +* connection status and refrain from reading EDID from a disconnected +* output. +* +* This callback is optional. Bridges that implement it shall set the +* DRM_BRIDGE_OP_EDID flag in their &drm_bridge->ops. +* +* The connector parameter shall be used for the sole purpose of EDID +* retrieval, and shall not be stored internally by bridge drivers for +* future usage. +* +* RETURNS: +* +* An edid structure newly allocated with drm_edid_alloc() or returned +* from drm_edid_read() family of functions on success, or NULL +* otherwise. The caller is responsible for freeing the returned edid +* structure with drm_edid_free(). +*/ +const struct drm_edid *(*edid_read)(struct drm_bridge *bridge, +struct drm_connector *connector); +/** * @get_edid: *
@@ -888,6 +919,8 @@ drm_atomic_helper_bridge_propagate_bus_fmt(struct drm_bridge *bridge,enum drm_connector_status drm_bridge_detect (struct drm_bridge *bridge);int drm_bridge_get_modes (struct drm_bridge *bridge,struct drm_connector *connector); +const struct drm_edid *drm_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector);struct edid *drm_bridge_get_edid (struct drm_bridge *bridge,struct drm_connector *connector); void drm_bridge_hpd_enable(struct drm_bridge *bridge,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 237/399 drm/bridge: lt8912b: use drm_bridge_edid_read()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 60d1fe1a7f302cc1151b155ac2d134db59bb1420 ]
Prefer using the struct drm_edid based functions.
Stable-dep-of: 171b711b26cc ("drm/bridge: lt8912b: do not return negative values from .get_modes()")
--- drivers/gpu/drm/bridge/lontium-lt8912b.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/lontium-lt8912b.c +6 -6
@@ -440,16 +440,16 @@ lt8912_connector_mode_valid(struct drm_connector *connector,static int lt8912_connector_get_modes (struct drm_connector *connector) { -struct edid *edid; +const struct drm_edid *drm_edid;int ret =-1 ;int num =0 ;struct lt8912 *lt =connector_to_lt8912 (connector);u32 bus_format =MEDIA_BUS_FMT_RGB888_1X24 ; - edid =drm_bridge_get_edid (lt->hdmi_port, connector); -if (edid) { -drm_connector_update_edid_property (connector, edid); - num =drm_add_edid_modes (connector, edid); + drm_edid =drm_bridge_edid_read (lt->hdmi_port, connector); +if (drm_edid) { +drm_edid_connector_update (connector, drm_edid); + num =drm_edid_connector_add_modes (connector); }else {return ret; }
@@ -459,7 +459,7 @@ static int lt8912_connector_get_modes(struct drm_connector *connector)if (ret) num = ret; -kfree (edid); +drm_edid_free (drm_edid);return num; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 238/399 drm/bridge: lt8912b: clear the EDID property on failures
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 29e032296da5d6294378ffa8bad8e976c5aadbf5 ]
If EDID read fails, clear the EDID property.
Stable-dep-of: 171b711b26cc ("drm/bridge: lt8912b: do not return negative values from .get_modes()")
--- drivers/gpu/drm/bridge/lontium-lt8912b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/lontium-lt8912b.c +1 -1
@@ -447,8 +447,8 @@ static int lt8912_connector_get_modes(struct drm_connector *connector)u32 bus_format =MEDIA_BUS_FMT_RGB888_1X24 ; drm_edid =drm_bridge_edid_read (lt->hdmi_port, connector); +drm_edid_connector_update (connector, drm_edid);if (drm_edid) { -drm_edid_connector_update (connector, drm_edid); num =drm_edid_connector_add_modes (connector); }else {return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 239/399 drm/bridge: lt8912b: do not return negative values from .get_modes()
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 171b711b26cce208bb628526b1b368aeec7b6fa4 ]
The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/bridge/lontium-lt8912b.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/gpu/drm/bridge/lontium-lt8912b.c +7 -9
@@ -441,23 +441,21 @@ lt8912_connector_mode_valid(struct drm_connector *connector,static int lt8912_connector_get_modes (struct drm_connector *connector) {const struct drm_edid *drm_edid; -int ret =-1 ; -int num =0 ;struct lt8912 *lt =connector_to_lt8912 (connector);u32 bus_format =MEDIA_BUS_FMT_RGB888_1X24 ; +int ret, num; drm_edid =drm_bridge_edid_read (lt->hdmi_port, connector);drm_edid_connector_update (connector, drm_edid); -if (drm_edid) { - num =drm_edid_connector_add_modes (connector); - }else { -return ret; - } +if (!drm_edid) +return 0 ; + + num =drm_edid_connector_add_modes (connector); ret =drm_display_info_set_bus_formats (&connector->display_info, &bus_format,1 ); -if (ret) - num = ret; +if (ret <0 ) + num =0 ;drm_edid_free (drm_edid);return num;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 240/399 drm/amd/display: Remove pixle rate limit for subvp
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alvin Lee <[email protected]>
[ Upstream commit 340383c734f8a4e1663d26356b35fd8050851168 ]
Subvp bugs related to 8K60 have been fixed, so remove the limit that blocks 8K60 timings from enabling SubVP.
Stable-dep-of: cf8c498694a4 ("drm/amd/display: Revert Remove pixle rate limit for subvp")
--- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +0 -1
@@ -623,7 +623,6 @@ static bool dcn32_assign_subvp_pipe(struct dc *dc,* - Not TMZ surface */ if (pipe->plane_state && !pipe->top_pipe && !dcn32_is_center_timing(pipe) && - !(pipe->stream->timing.pix_clk_100hz / 10000 > DCN3_2_MAX_SUBVP_PIXEL_RATE_MHZ) && (!dcn32_is_psr_capable(pipe) || (context->stream_count == 1 && dc->caps.dmub_caps.subvp_psr)) && dc_state_get_pipe_subvp_type(context, pipe) == SUBVP_NONE && (refresh_rate < 120 || dcn32_allow_subvp_high_refresh_rate(dc, context, pipe)) &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 241/399 drm/amd/display: Revert Remove pixle rate limit for subvp
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenjing Liu <[email protected]>
[ Upstream commit cf8c498694a443e28dc1222f3ab94677114a4724 ]
This reverts commit 340383c734f8 ("drm/amd/display: Remove pixle rate limit for subvp")
[why]
The original commit causes a regression when subvp is applied on ODM required 8k60hz timing. The display shows black screen on boot. The issue can be recovered with hotplug. It also causes MPO to fail. We will temprarily revert this commit and investigate the root cause further.
--- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +1 -0
@@ -623,6 +623,7 @@ static bool dcn32_assign_subvp_pipe(struct dc *dc,* - Not TMZ surface */ if (pipe->plane_state && !pipe->top_pipe && !dcn32_is_center_timing(pipe) && + !(pipe->stream->timing.pix_clk_100hz / 10000 > DCN3_2_MAX_SUBVP_PIXEL_RATE_MHZ) && (!dcn32_is_psr_capable(pipe) || (context->stream_count == 1 && dc->caps.dmub_caps.subvp_psr)) && dc_state_get_pipe_subvp_type(context, pipe) == SUBVP_NONE && (refresh_rate < 120 || dcn32_allow_subvp_high_refresh_rate(dc, context, pipe)) &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 242/399 workqueue: Shorten events_freezable_power_efficient name
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Audra Mitchell <[email protected]>
commit 8318d6a6362f5903edb4c904a8dd447e59be4ad1 upstream.
Since we have set the WQ_NAME_LEN to 32, decrease the name of events_freezable_power_efficient so that it does not trip the name length warning when the workqueue is created.
--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/workqueue.c +1 -1
@@ -7186,7 +7186,7 @@ void __init workqueue_init_early(void) WQ_FREEZABLE, 0); system_power_efficient_wq =alloc_workqueue ("events_power_efficient" ,WQ_POWER_EFFICIENT ,0 ); - system_freezable_power_efficient_wq =alloc_workqueue ("events_freezable_power_efficient" , + system_freezable_power_efficient_wq =alloc_workqueue ("events_freezable_pwr_efficient" ,WQ_FREEZABLE |WQ_POWER_EFFICIENT ,0 ); BUG_ON(!system_wq || !system_highpri_wq || !system_long_wq ||
Greg Kroah-Hartman
maintainerPATCH 243/399 drm/amd/display: Use freesync when `DRM_EDID_FEATURE_CONTINUOUS_FREQ` found
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 2f14c0c8cae8e9e3b603a3f91909baba66540027 upstream.
The monitor shipped with the Framework 16 supports VRR [1], but it's not being advertised.
This is because the detailed timing block doesn't contain EDID_DETAIL_MONITOR_RANGE which amdgpu looks for to find min and max frequencies. This check however is superfluous for this case because update_display_info() calls drm_get_monitor_range() to get these ranges already.
So if the DRM_EDID_FEATURE_CONTINUOUS_FREQ EDID feature is found then turn on freesync without extra checks.
v2: squash in fix from Harry
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +14 -8
@@ -11140,18 +11140,24 @@ void amdgpu_dm_update_freesync_caps(struif (!adev->dm.freesync_module) goto update; -if (sink->sink_signal ==SIGNAL_TYPE_DISPLAY_PORT - || sink->sink_signal ==SIGNAL_TYPE_EDP ) { +if (edid && (sink->sink_signal ==SIGNAL_TYPE_DISPLAY_PORT || + sink->sink_signal ==SIGNAL_TYPE_EDP )) {bool edid_check_required = false; -if (edid) { - edid_check_required =is_dp_capable_without_timing_msa ( - adev->dm.dc, - amdgpu_dm_connector); +if (is_dp_capable_without_timing_msa (adev->dm.dc, + amdgpu_dm_connector)) { +if (edid->features &DRM_EDID_FEATURE_CONTINUOUS_FREQ ) { + freesync_capable = true; + amdgpu_dm_connector->min_vfreq = connector->display_info.monitor_range.min_vfreq; + amdgpu_dm_connector->max_vfreq = connector->display_info.monitor_range.max_vfreq; + }else { + edid_check_required = edid->version >1 || + (edid->version ==1 && + edid->revision >1 ); + } } -if (edid_check_required == true && (edid->version >1 || - (edid->version ==1 && edid->revision >1 ))) { +if (edid_check_required) {for (i =0 ; i <4 ; i++) { timing = &edid->detailed_timings[i];
Greg Kroah-Hartman
maintainerPATCH 244/399 netfilter: nf_tables: reject constant set with timeout
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 5f4fc4bd5cddb4770ab120ce44f02695c4505562 upstream.
This set combination is weird: it allows for elements to be added/deleted, but once bound to the rule it cannot be updated anymore. Eventually, all elements expire, leading to an empty set which cannot be updated anymore. Reject this flags combination.
--- net/netfilter/nf_tables_api.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nf_tables_api.c +3 -0
@@ -5008,6 +5008,9 @@ static int nf_tables_newset(struct sk_buif ((flags & (NFT_SET_CONSTANT |NFT_SET_TIMEOUT )) == (NFT_SET_CONSTANT |NFT_SET_TIMEOUT ))return -EOPNOTSUPP ; +if ((flags & (NFT_SET_CONSTANT |NFT_SET_TIMEOUT )) == + (NFT_SET_CONSTANT |NFT_SET_TIMEOUT )) +return -EOPNOTSUPP ; } desc.dtype =0 ;
Greg Kroah-Hartman
maintainerPATCH 245/399 Revert "crypto: pkcs7 - remove sha1 support"
In reply to Greg Kroah-Hartman6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit 203a6763ab699da0568fd2b76303d03bb121abd4 upstream.
This reverts commit 16ab7cb5825fc3425c16ad2c6e53d827f382d7c6 because it broke iwd. iwd uses the KEYCTL_PKEY_* UAPIs via its dependency libell, and apparently it is relying on SHA-1 signature support. These UAPIs are fairly obscure, and their documentation does not mention which algorithms they support. iwd really should be using a properly supported userspace crypto library instead. Regardless, since something broke we have to revert the change.
It may be possible that some parts of this commit can be reinstated without breaking iwd (e.g. probably the removal of MODULE_SIG_SHA1), but for now this just does a full revert to get things working again.
--- crypto/asymmetric_keys/mscode_parser.c | 3 + crypto/asymmetric_keys/pkcs7_parser.c | 4 + crypto/asymmetric_keys/public_key.c | 3 - crypto/asymmetric_keys/signature.c | 2 crypto/asymmetric_keys/x509_cert_parser.c | 8 +++ crypto/testmgr.h | 80 ++++++++++++++++++++++++++++++ include/linux/oid_registry.h | 4 + kernel/module/Kconfig | 5 + 8 files changed, 107 insertions(+), 2 deletions(-)
crypto/asymmetric_keys/mscode_parser.c +3 -0
@@ -75,6 +75,9 @@ int mscode_note_digest_algo(void *contex oid =look_up_OID (value, vlen);switch (oid) { +case OID_sha1: + ctx->digest_algo ="sha1" ; +break ;case OID_sha256: ctx->digest_algo ="sha256" ;break ;
crypto/asymmetric_keys/pkcs7_parser.c +4 -0
@@ -227,6 +227,9 @@ int pkcs7_sig_note_digest_algo(void *construct pkcs7_parse_context *ctx = context;switch (ctx->last_oid) { +case OID_sha1: + ctx->sinfo->sig->hash_algo ="sha1" ; +break ;case OID_sha256: ctx->sinfo->sig->hash_algo ="sha256" ;break ;
@@ -278,6 +281,7 @@ int pkcs7_sig_note_pkey_algo(void *conte ctx->sinfo->sig->pkey_algo ="rsa" ; ctx->sinfo->sig->encoding ="pkcs1" ;break ; +case OID_id_ecdsa_with_sha1:case OID_id_ecdsa_with_sha224:case OID_id_ecdsa_with_sha256:case OID_id_ecdsa_with_sha384:
crypto/asymmetric_keys/public_key.c +2 -1
@@ -115,7 +115,8 @@ software_key_determine_akcipher(const st*/ if (!hash_algo)return -EINVAL ; - if (strcmp(hash_algo, "sha224") != 0 && + if (strcmp(hash_algo, "sha1") != 0 && + strcmp(hash_algo, "sha224") != 0 && strcmp(hash_algo, "sha256") != 0 && strcmp(hash_algo, "sha384") != 0 && strcmp(hash_algo, "sha512") != 0 &&
crypto/asymmetric_keys/signature.c +1 -1
@@ -115,7 +115,7 @@ EXPORT_SYMBOL_GPL(decrypt_blob);* Sign the specified data blob using the private key specified by params->key. * The signature is wrapped in an encoding if params->encoding is specified * (eg. "pkcs1"). If the encoding needs to know the digest type, this can be -* passed through params->hash_algo (eg. "sha512"). +* passed through params->hash_algo (eg. "sha1"). * * Returns the length of the data placed in the signature buffer or an error. */
crypto/asymmetric_keys/x509_cert_parser.c +8 -0
@@ -198,6 +198,10 @@ int x509_note_sig_algo(void *context, sidefault :return -ENOPKG ;/* Unsupported combination */ +case OID_sha1WithRSAEncryption: + ctx->cert->sig->hash_algo ="sha1" ; + goto rsa_pkcs1; +case OID_sha256WithRSAEncryption: ctx->cert->sig->hash_algo ="sha256" ; goto rsa_pkcs1;
@@ -214,6 +218,10 @@ int x509_note_sig_algo(void *context, si ctx->cert->sig->hash_algo ="sha224" ; goto rsa_pkcs1; +case OID_id_ecdsa_with_sha1: + ctx->cert->sig->hash_algo ="sha1" ; + goto ecdsa; +case OID_id_rsassa_pkcs1_v1_5_with_sha3_256: ctx->cert->sig->hash_algo ="sha3-256" ; goto rsa_pkcs1;
crypto/testmgr.h +80 -0
98 lines not on this page · raw message
include/linux/oid_registry.h +4 -0
@@ -17,10 +17,12 @@* build_OID_registry.pl to generate the data for look_up_OID(). */ enum OID { + OID_id_dsa_with_sha1,/* 1.2.840.10030.4.3 */ OID_id_dsa,/* 1.2.840.10040.4.1 */ OID_id_ecPublicKey,/* 1.2.840.10045.2.1 */ OID_id_prime192v1,/* 1.2.840.10045.3.1.1 */ OID_id_prime256v1,/* 1.2.840.10045.3.1.7 */ + OID_id_ecdsa_with_sha1,/* 1.2.840.10045.4.1 */ OID_id_ecdsa_with_sha224,/* 1.2.840.10045.4.3.1 */ OID_id_ecdsa_with_sha256,/* 1.2.840.10045.4.3.2 */ OID_id_ecdsa_with_sha384,/* 1.2.840.10045.4.3.3 */
@@ -28,6 +30,7 @@ enum OID {/* PKCS#1 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)} */ OID_rsaEncryption,/* 1.2.840.113549.1.1.1 */ + OID_sha1WithRSAEncryption,/* 1.2.840.113549.1.1.5 */ OID_sha256WithRSAEncryption,/* 1.2.840.113549.1.1.11 */ OID_sha384WithRSAEncryption,/* 1.2.840.113549.1.1.12 */ OID_sha512WithRSAEncryption, /* 1.2.840.113549.1.1.13 */
@@ -64,6 +67,7 @@ enum OID {OID_PKU2U ,/* 1.3.5.1.5.2.7 */ OID_Scram,/* 1.3.6.1.5.5.14 */ OID_certAuthInfoAccess,/* 1.3.6.1.5.5.7.1.1 */ + OID_sha1,/* 1.3.14.3.2.26 */ OID_id_ansip384r1,/* 1.3.132.0.34 */ OID_sha256,/* 2.16.840.1.101.3.4.2.1 */ OID_sha384, /* 2.16.840.1.101.3.4.2.2 */
kernel/module/Kconfig +5 -0
@@ -236,6 +236,10 @@ choice possible to load a signed module containing the algorithm to check the signature on that module. +config MODULE_SIG_SHA1 + bool "Sign modules with SHA-1" + select CRYPTO_SHA1 + config MODULE_SIG_SHA256 bool "Sign modules with SHA-256" select CRYPTO_SHA256
@@ -265,6 +269,7 @@ endchoice config MODULE_SIG_HASH string depends on MODULE_SIG || IMA_APPRAISE_MODSIG + default "sha1" if MODULE_SIG_SHA1 default "sha256" if MODULE_SIG_SHA256 default "sha384" if MODULE_SIG_SHA384 default "sha512" if MODULE_SIG_SHA512