x86/kexec: Allocate PGD for x86_64 transition page tables separately
Subsystems (5)
Sasha Levin
maintainerPATCH 1/9 x86/kexec: Allocate PGD for x86_64 transition page tables separately
From: David Woodhouse <[email protected]>
[ Upstream commit 4b5bc2ec9a239bce261ffeafdd63571134102323 ]
Now that the following fix:
d0ceea662d45 ("x86/mm: Add _PAGE_NOPTISHADOW bit to avoid updating userspace page tables")
stops kernel_ident_mapping_init() from scribbling over the end of a 4KiB PGD by assuming the following 4KiB will be a userspace PGD, there's no good reason for the kexec PGD to be part of a single 8KiB allocation with the control_code_page.
( It's not clear that that was the reason for x86_64 kexec doing it that
way in the first place either; there were no comments to that effect and it seems to have been the case even before PTI came along. It looks like it was just a happy accident which prevented memory corruption on kexec. )
Either way, it definitely isn't needed now. Just allocate the PGD separately on x86_64, like i386 already does.
--- arch/x86/include/asm/kexec.h | 18 +++++++++--- arch/x86/kernel/machine_kexec_64.c | 45 ++++++++++++++++-------------- 2 files changed, 38 insertions(+), 25 deletions(-)
arch/x86/include/asm/kexec.h +14 -4
@@ -16,6 +16,7 @@# define PAGES_NR 4#endif +# define KEXEC_CONTROL_PAGE_SIZE 4096# define KEXEC_CONTROL_CODE_MAX_SIZE 2048#ifndef __ASSEMBLY__
@@ -44,7 +45,6 @@ struct kimage;/* Maximum address we can use for the control code buffer */ # define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -# define KEXEC_CONTROL_PAGE_SIZE 4096/* The native architecture */ # define KEXEC_ARCH KEXEC_ARCH_386
@@ -59,9 +59,6 @@ struct kimage;/* Maximum address we can use for the control pages */ # define KEXEC_CONTROL_MEMORY_LIMIT (MAXMEM-1) -/* Allocate one page for the pdp and the second for the code */ -# define KEXEC_CONTROL_PAGE_SIZE (4096UL + 4096UL) -/* The native architecture */ # define KEXEC_ARCH KEXEC_ARCH_X86_64#endif
@@ -146,6 +143,19 @@ struct kimage_arch { }; #else struct kimage_arch { + /* + * This is a kimage control page, as it must not overlap with either + * source or destination address ranges. + */ + pgd_t *pgd; + /* + * The virtual mapping of the control code page itself is used only + * during the transition, while the current kernel's pages are all + * in place. Thus the intermediate page table pages used to map it + * are not control pages, but instead just normal pages obtained + * with get_zeroed_page(). And have to be tracked (below) so that + * they can be freed. + */ p4d_t *p4d; pud_t *pud; pmd_t *pmd;
arch/x86/kernel/machine_kexec_64.c +24 -21
123 lines not on this page · raw message
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 2/9 iommu/arm-smmu-qcom: add sdm670 adreno iommu compatible
From: Richard Acayan <[email protected]>
[ Upstream commit 42314738906380cbd3b6e9caf3ad34e1b2d66035 ]
Add the compatible for the separate IOMMU on SDM670 for the Adreno GPU.
This IOMMU has the compatible strings:
"qcom,sdm670-smmu-v2", "qcom,adreno-smmu", "qcom,smmu-v2"
While the SMMU 500 doesn't need an entry for this specific SoC, the SMMU v2 compatible should have its own entry, as the fallback entry in arm-smmu.c handles "qcom,smmu-v2" without per-process page table support unless there is an entry here. This entry can't be the "qcom,adreno-smmu" compatible because dedicated GPU IOMMUs can also be SMMU 500 with different handling.
--- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +1 -0
@@ -554,6 +554,7 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = { { .compatible = "qcom,sc8180x-smmu-500", .data = &qcom_smmu_500_impl0_data }, { .compatible = "qcom,sc8280xp-smmu-500", .data = &qcom_smmu_500_impl0_data }, { .compatible = "qcom,sdm630-smmu-v2", .data = &qcom_smmu_v2_data }, + { .compatible = "qcom,sdm670-smmu-v2", .data = &qcom_smmu_v2_data }, { .compatible = "qcom,sdm845-smmu-v2", .data = &qcom_smmu_v2_data }, { .compatible = "qcom,sdm845-smmu-500", .data = &sdm845_smmu_500_data }, { .compatible = "qcom,sm6115-smmu-500", .data = &qcom_smmu_500_impl0_data},
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 3/9 tool api fs: Correctly encode errno for read/write open failures
In reply to Sasha LevinFrom: Ian Rogers <[email protected]>
[ Upstream commit 05be17eed774aaf56f6b1e12714325ca3a266c04 ]
Switch from returning -1 to -errno so that callers can determine types of failure.
--- tools/lib/api/fs/fs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/lib/api/fs/fs.c +3 -3
@@ -295,7 +295,7 @@ int filename__read_int(const char *filename, int *value)int fd =open (filename,O_RDONLY ), err =-1 ;if (fd <0 ) -return -1 ; +return -errno;if (read (fd, line,sizeof (line)) >0 ) { *value =atoi (line);
@@ -313,7 +313,7 @@ static int filename__read_ull_base(const char *filename,int fd =open (filename,O_RDONLY ), err =-1 ;if (fd <0 ) -return -1 ; +return -errno;if (read (fd, line,sizeof (line)) >0 ) { *value =strtoull (line,NULL , base);
@@ -400,7 +400,7 @@ int filename__write_int(const char *filename, int value)char buf[64 ];if (fd <0 ) -return err; +return -errno;sprintf (buf,"%d" , value);if (write (fd, buf,sizeof (buf)) ==sizeof (buf))
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 4/9 iommu/arm-smmu-v3: Clean up more on probe failure
In reply to Sasha LevinFrom: Robin Murphy <[email protected]>
[ Upstream commit fcbd621567420b3a2f21f49bbc056de8b273c625 ]
kmemleak noticed that the iopf queue allocated deep down within arm_smmu_init_structures() can be leaked by a subsequent error return from arm_smmu_device_probe(). Furthermore, after arm_smmu_device_reset() we will also leave the SMMU enabled with an empty Stream Table, silently blocking all DMA. This proves rather annoying for debugging said probe failure, so let's handle it a bit better by putting the SMMU back into (more or less) the same state as if it hadn't probed at all.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +12 -5
@@ -3875,7 +3875,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev)/* Initialise in-memory data structures */ ret =arm_smmu_init_structures (smmu);if (ret) -return ret; + goto err_free_iopf;/* Record our private device structure */ platform_set_drvdata (pdev, smmu);
@@ -3886,22 +3886,29 @@ static int arm_smmu_device_probe(struct platform_device *pdev)/* Reset the device */ ret =arm_smmu_device_reset (smmu, bypass);if (ret) -return ret; + goto err_disable;/* And we're up. Go go go! */ ret =iommu_device_sysfs_add (&smmu->iommu, dev,NULL ,"smmu3.%pa" , &ioaddr);if (ret) -return ret; + goto err_disable; ret =iommu_device_register (&smmu->iommu, &arm_smmu_ops, dev);if (ret) {dev_err (dev,"Failed to register iommu\n" ); -iommu_device_sysfs_remove (&smmu->iommu); -return ret; + goto err_free_sysfs; }return 0 ; + +err_free_sysfs: +iommu_device_sysfs_remove (&smmu->iommu); +err_disable: +arm_smmu_device_disable (smmu); +err_free_iopf: +iopf_queue_free (smmu->evtq.iopf); +return ret; }static void arm_smmu_device_remove (struct platform_device *pdev)
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 5/9 platform/x86: int3472: Check for adev == NULL
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit cd2fd6eab480dfc247b737cf7a3d6b009c4d0f1c ]
Not all devices have an ACPI companion fwnode, so adev might be NULL. This can e.g. (theoretically) happen when a user manually binds one of the int3472 drivers to another i2c/platform device through sysfs.
Add a check for adev not being set and return -ENODEV in that case to avoid a possible NULL pointer deref in skl_int3472_get_acpi_buffer().
--- drivers/platform/x86/intel/int3472/discrete.c | 3 +++ drivers/platform/x86/intel/int3472/tps68470.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/platform/x86/intel/int3472/discrete.c +3 -0
@@ -284,6 +284,9 @@ static int skl_int3472_discrete_probe(struct platform_device *pdev)struct int3472_cldb cldb;int ret; +if (!adev) +return -ENODEV ; + ret =skl_int3472_fill_cldb (adev, &cldb);if (ret) {dev_err (&pdev->dev,"Couldn't fill CLDB structure\n" );
drivers/platform/x86/intel/int3472/tps68470.c +3 -0
@@ -152,6 +152,9 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)int ret;int i; +if (!adev) +return -ENODEV ; + n_consumers =skl_int3472_fill_clk_pdata (&client->dev, &clk_pdata);if (n_consumers <0 )return n_consumers;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 6/9 ASoC: soc-pcm: don't use soc_pcm_ret() on .prepare callback
In reply to Sasha LevinFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit 301c26a018acb94dd537a4418cefa0f654500c6f ]
commit 1f5664351410 ("ASoC: lower "no backend DAIs enabled for ... Port" log severity") ignores -EINVAL error message on common soc_pcm_ret(). It is used from many functions, ignoring -EINVAL is over-kill.
The reason why -EINVAL was ignored was it really should only be used upon invalid parameters coming from userspace and in that case we don't want to log an error since we do not want to give userspace a way to do a denial-of-service attack on the syslog / diskspace.
So don't use soc_pcm_ret() on .prepare callback is better idea.
--- sound/soc/soc-pcm.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)
sound/soc/soc-pcm.c +28 -4
@@ -38,7 +38,6 @@ static inline int _soc_pcm_ret(struct snd_soc_pcm_runtime *rtd,switch (ret) {case -EPROBE_DEFER :case -ENOTSUPP : -case -EINVAL :break ;default : dev_err(rtd->dev,
@@ -902,7 +901,13 @@ static int __soc_pcm_prepare(struct snd_soc_pcm_runtime *rtd, } out: -return soc_pcm_ret (rtd, ret); +/* +* Don't use soc_pcm_ret() on .prepare callback to lower error log severity +* +* We don't want to log an error since we do not want to give userspace a way to do a +* denial-of-service attack on the syslog / diskspace. +*/ +return ret; }/* PCM prepare ops for non-DPCM streams */
@@ -914,6 +919,13 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)snd_soc_dpcm_mutex_lock (rtd); ret =__soc_pcm_prepare (rtd, substream);snd_soc_dpcm_mutex_unlock (rtd); + +/* +* Don't use soc_pcm_ret() on .prepare callback to lower error log severity +* +* We don't want to log an error since we do not want to give userspace a way to do a +* denial-of-service attack on the syslog / diskspace. +*/ return ret; }
@@ -2461,7 +2473,13 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream) be->dpcm[stream].state =SND_SOC_DPCM_STATE_PREPARE ; } -return soc_pcm_ret (fe, ret); +/* +* Don't use soc_pcm_ret() on .prepare callback to lower error log severity +* +* We don't want to log an error since we do not want to give userspace a way to do a +* denial-of-service attack on the syslog / diskspace. +*/ +return ret; }static int dpcm_fe_dai_prepare (struct snd_pcm_substream *substream)
@@ -2501,7 +2519,13 @@ static int dpcm_fe_dai_prepare(struct snd_pcm_substream *substream)dpcm_set_fe_update_state (fe, stream,SND_SOC_DPCM_UPDATE_NO );snd_soc_dpcm_mutex_unlock (fe); -return soc_pcm_ret (fe, ret); +/* +* Don't use soc_pcm_ret() on .prepare callback to lower error log severity +* +* We don't want to log an error since we do not want to give userspace a way to do a +* denial-of-service attack on the syslog / diskspace. +*/ +return ret; }static int dpcm_run_update_shutdown (struct snd_soc_pcm_runtime *fe,int stream)
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 7/9 ASoC: amd: Add ACPI dependency to fix build error
In reply to Sasha LevinFrom: Yu-Chun Lin <[email protected]>
[ Upstream commit 7e24ec93aecd12e33d31e38e5af4625553bbc727 ]
As reported by the kernel test robot, the following error occurs:
sound/soc/amd/yc/acp6x-mach.c: In function 'acp6x_probe':
Quoted 1 line
Quoted 1 line
sound/soc/amd/yc/acp6x-mach.c:573:15: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
573 | ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);
| ^~~~~~~~~~~~~~~~~~~~~
| acpi_evaluate_objectcc1: some warnings being treated as errors
The function 'acpi_evaluate_integer' and its prototype in 'acpi_bus.h' are only available when 'CONFIG_ACPI' is enabled. Add a 'depends on ACPI' directive in Kconfig to ensure proper compilation.
--- sound/soc/amd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/amd/Kconfig +1 -1
@@ -105,7 +105,7 @@ config SND_SOC_AMD_ACP6x config SND_SOC_AMD_YC_MACH tristate "AMD YC support for DMIC" select SND_SOC_DMIC - depends on SND_SOC_AMD_ACP6x + depends on SND_SOC_AMD_ACP6x && ACPI help This option enables machine driver for Yellow Carp platform using dmic. ACP IP has PDM Decoder block with DMA controller.
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 8/9 Input: allocate keycode for phone linking
In reply to Sasha LevinFrom: Illia Ostapyshyn <[email protected]>
[ Upstream commit 1bebc7869c99d466f819dd2cffaef0edf7d7a035 ]
The F11 key on the new Lenovo Thinkpad T14 Gen 5, T16 Gen 3, and P14s Gen 5 laptops includes a symbol showing a smartphone and a laptop chained together. According to the user manual, it starts the Microsoft Phone Link software used to connect to Android/iOS devices and relay messages/calls or sync data.
As there are no suitable keycodes for this action, introduce a new one.
--- include/uapi/linux/input-event-codes.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/input-event-codes.h +1 -0
@@ -519,6 +519,7 @@#define KEY_NOTIFICATION_CENTER 0x1bc/* Show/hide the notification center */ #define KEY_PICKUP_PHONE 0x1bd/* Answer incoming call */ #define KEY_HANGUP_PHONE 0x1be/* Decline incoming call */ +#define KEY_LINK_PHONE 0x1bf/* AL Phone Syncing */ #define KEY_DEL_EOL 0x1c0#define KEY_DEL_EOS 0x1c1
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 9/9 platform/x86: acer-wmi: Ignore AC events
In reply to Sasha LevinFrom: Armin Wolf <[email protected]>
[ Upstream commit f6bfa25c6665f8721421ea94fe506cc22f1d4b43 ]
On the Acer Swift SFG14-41, the events 8 - 1 and 8 - 0 are printed on AC connect/disconnect. Ignore those events to avoid spamming the kernel log with error messages.
--- drivers/platform/x86/acer-wmi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/platform/x86/acer-wmi.c +4 -0
@@ -88,6 +88,7 @@ enum acer_wmi_event_ids {WMID_HOTKEY_EVENT =0x1 ,WMID_ACCEL_OR_KBD_DOCK_EVENT =0x5 ,WMID_GAMING_TURBO_KEY_EVENT =0x7 , + WMID_AC_EVENT = 0x8, }; static const struct key_entry acer_wmi_keymap[] __initconst = {
@@ -1999,6 +2000,9 @@ static void acer_wmi_notify(u32 value, void *context)if (return_value.key_num ==0x4 )acer_toggle_turbo ();break ; +case WMID_AC_EVENT : +/* We ignore AC events here */ +break ;default :pr_warn ("Unknown function number - %d - %d\n" , return_value.function, return_value.key_num);
Signature · 1 line
2.39.5