January 2021 - Linux-stable-mirror

[PATCH fixes v2] platform/x86: ideapad-laptop: Disable touchpad_switch for ELAN0634

by Jiaxun Yang

Newer ideapads (e.g.: Yoga 14s, 720S 14) come with ELAN0634 touchpad do not use EC to switch touchpad. Reading VPCCMD_R_TOUCHPAD will return zero thus touchpad may be blocked unexpectedly. Writing VPCCMD_W_TOUCHPAD may cause a spurious key press. Add has_touchpad_switch to workaround these machines. Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> Cc: stable(a)vger.kernel.org # 5.4+ -- v2: Specify touchpad to ELAN0634 --- drivers/platform/x86/ideapad-laptop.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index 7598cd46cf60..3bd29eb956d2 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -92,6 +92,7 @@ struct ideapad_private { struct dentry *debug; unsigned long cfg; bool has_hw_rfkill_switch; + bool has_touchpad_switch; const char *fnesc_guid; }; @@ -535,7 +536,9 @@ static umode_t ideapad_is_visible(struct kobject *kobj, } else if (attr == &dev_attr_fn_lock.attr) { supported = acpi_has_method(priv->adev->handle, "HALS") && acpi_has_method(priv->adev->handle, "SALS"); - } else + } else if (attr == &dev_attr_touchpad.attr) + supported = priv->has_touchpad_switch; + else supported = true; return supported ? attr->mode : 0; @@ -867,6 +870,9 @@ static void ideapad_sync_touchpad_state(struct ideapad_private *priv) { unsigned long value; + if (!priv->has_touchpad_switch) + return; + /* Without reading from EC touchpad LED doesn't switch state */ if (!read_ec_data(priv->adev->handle, VPCCMD_R_TOUCHPAD, &value)) { /* Some IdeaPads don't really turn off touchpad - they only @@ -989,6 +995,9 @@ static int ideapad_acpi_add(struct platform_device *pdev) priv->platform_device = pdev; priv->has_hw_rfkill_switch = dmi_check_system(hw_rfkill_list); + /* Most ideapads with ELAN0634 touchpad don't use EC touchpad switch */ + priv->has_touchpad_switch = acpi_dev_present("PNP0C50", "ELAN0634", -1); + ret = ideapad_sysfs_init(priv); if (ret) return ret; @@ -1006,6 +1015,10 @@ static int ideapad_acpi_add(struct platform_device *pdev) if (!priv->has_hw_rfkill_switch) write_ec_cmd(priv->adev->handle, VPCCMD_W_RF, 1); + /* The same for Touchpad */ + if (!priv->has_touchpad_switch) + write_ec_cmd(priv->adev->handle, VPCCMD_W_TOUCHPAD, 1); + for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++) if (test_bit(ideapad_rfk_data[i].cfgbit, &priv->cfg)) ideapad_register_rfkill(priv, i); -- 2.30.0

3 years, 4 months

1
0
0 0

[PATCH 3/4] kernel/io_uring: cancel io_uring before task works

by Pavel Begunkov

For cancelling io_uring requests it needs either to be able to run currently enqueued task_wokrs or having it shut down by that moment. Otherwise io_uring_cancel_files() may be waiting for requests that won't ever complete. Go with the first way and do cancellations before setting PF_EXITING and so before putting the task_work infrastructure into a transition state where task_work_run() would better not be called. Cc: stable(a)vger.kernel.org # 5.5+ Signed-off-by: Pavel Begunkov <asml.silence(a)gmail.com> --- fs/file.c | 2 -- kernel/exit.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/file.c b/fs/file.c index c0b60961c672..dab120b71e44 100644 --- a/fs/file.c +++ b/fs/file.c @@ -21,7 +21,6 @@ #include <linux/rcupdate.h> #include <linux/close_range.h> #include <net/sock.h> -#include <linux/io_uring.h> unsigned int sysctl_nr_open __read_mostly = 1024*1024; unsigned int sysctl_nr_open_min = BITS_PER_LONG; @@ -428,7 +427,6 @@ void exit_files(struct task_struct *tsk) struct files_struct * files = tsk->files; if (files) { - io_uring_files_cancel(files); task_lock(tsk); tsk->files = NULL; task_unlock(tsk); diff --git a/kernel/exit.c b/kernel/exit.c index 3594291a8542..04029e35e69a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -63,6 +63,7 @@ #include <linux/random.h> #include <linux/rcuwait.h> #include <linux/compat.h> +#include <linux/io_uring.h> #include <linux/uaccess.h> #include <asm/unistd.h> @@ -776,6 +777,7 @@ void __noreturn do_exit(long code) schedule(); } + io_uring_files_cancel(tsk->files); exit_signals(tsk); /* sets PF_EXITING */ /* sync mm's RSS info before statistics gathering */ -- 2.24.0

3 years, 4 months

1
1
0 0

[PATCH 4.19 000/346] 4.19.164-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.164 release. There are 346 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 30 Dec 2020 12:48:23 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.164-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.164-rc1 Jubin Zhong <zhongjubin(a)huawei.com> PCI: Fix pci_slot_release() NULL pointer dereference Carlos Garnacho <carlosg(a)gnome.org> platform/x86: intel-vbtn: Allow switch events on Acer Switch Alpha 12 Dan Williams <dan.j.williams(a)intel.com> libnvdimm/namespace: Fix reaping of invalidated block-window-namespace labels SeongJae Park <sjpark(a)amazon.de> xenbus/xenbus_backend: Disallow pending watch messages SeongJae Park <sjpark(a)amazon.de> xen/xenbus: Count pending messages for each watch SeongJae Park <sjpark(a)amazon.de> xen/xenbus/xen_bus_type: Support will_handle watch callback SeongJae Park <sjpark(a)amazon.de> xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() SeongJae Park <sjpark(a)amazon.de> xen/xenbus: Allow watches discard events before queueing Pawel Wieczorkiewicz <wipawel(a)amazon.de> xen-blkback: set ring->xenblkd to NULL after kthread_stop() Terry Zhou <bjzhou(a)marvell.com> clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 Yangtao Li <frank(a)allwinnertech.com> pinctrl: sunxi: Always call chained_irq_{enter, exit} in sunxi_pinctrl_irq_handler Zhao Heming <heming.zhao(a)suse.com> md/cluster: fix deadlock when node is doing resync job Zhao Heming <heming.zhao(a)suse.com> md/cluster: block reshape with remote resync job Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:imu:bmi160: Fix too large a buffer. Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:pressure:mpl3115: Force alignment of buffer Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:light:st_uvis25: Fix timestamp alignment and prevent data leak. Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:light:rpr0521: Fix timestamp alignment and prevent data leak. Qinglang Miao <miaoqinglang(a)huawei.com> iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume Nuno Sá <nuno.sa(a)analog.com> iio: buffer: Fix demux update James Smart <james.smart(a)broadcom.com> scsi: lpfc: Re-fix use after free in lpfc_rq_buf_free() James Smart <james.smart(a)broadcom.com> scsi: lpfc: Fix invalid sleeping context in lpfc_sli4_nvmet_alloc() Praveenkumar I <ipkumar(a)codeaurora.org> mtd: rawnand: qcom: Fix DMA sync on FLASH_STATUS register read Sven Eckelmann <sven(a)narfation.org> mtd: parser: cmdline: Fix parsing of part-names with colons Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: spinand: Fix OOB read Evan Green <evgreen(a)chromium.org> soc: qcom: smp2p: Safely acquire spinlock without IRQs Qinglang Miao <miaoqinglang(a)huawei.com> spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe Lukas Wunner <lukas(a)wunner.de> spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path Lukas Wunner <lukas(a)wunner.de> spi: sc18is602: Don't leak SPI master in probe error path Lukas Wunner <lukas(a)wunner.de> spi: rb4xx: Don't leak SPI master in probe error path Lukas Wunner <lukas(a)wunner.de> spi: pic32: Don't leak DMA channels in probe error path Lukas Wunner <lukas(a)wunner.de> spi: davinci: Fix use-after-free on unbind Lukas Wunner <lukas(a)wunner.de> spi: spi-sh: Fix use-after-free on unbind Zwane Mwaikambo <zwane(a)yosper.io> drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() Dave Kleikamp <dave.kleikamp(a)oracle.com> jfs: Fix array index bounds check in dbAdjTree Zhe Li <lizhe67(a)huawei.com> jffs2: Fix GC exit abnormally Richard Weinberger <richard(a)nod.at> ubifs: wbuf: Don't leak kernel memory to flash Steve French <stfrench(a)microsoft.com> SMB3.1.1: do not log warning message if server doesn't populate salt Steve French <stfrench(a)microsoft.com> SMB3: avoid confusing warning message on mount to Azure Luis Henriques <lhenriques(a)suse.de> ceph: fix race in concurrent __ceph_remove_cap invocations Roberto Sassu <roberto.sassu(a)huawei.com> ima: Don't modify file descriptor mode on the fly David Hildenbrand <david(a)redhat.com> powerpc/powernv/memtrace: Fix crashing the kernel when enabling concurrently David Hildenbrand <david(a)redhat.com> powerpc/powernv/memtrace: Don't leak kernel memory to user space Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/xmon: Change printk() to pr_cont() Tyrel Datwyler <tyreld(a)linux.ibm.com> powerpc/rtas: Fix typo of ibm,open-errinjct in RTAS filter Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> powerpc: Fix incorrect stw{, ux, u, x} instructions in __set_pte_at Nicolas Ferre <nicolas.ferre(a)microchip.com> ARM: dts: at91: sama5d2: fix CAN message ram offset and size H. Nikolaus Schaller <hns(a)goldelico.com> ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES Marc Zyngier <maz(a)kernel.org> KVM: arm64: Introduce handling of AArch32 TTBCR2 traps Jan Kara <jack(a)suse.cz> ext4: fix deadlock with fs freezing and EA inodes Chunguang Xu <brookxu(a)tencent.com> ext4: fix a memory leak of ext4_free_data Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix write unthrottling Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix tx-unthrottle use-after-free Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix write-wakeup use-after-free Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix stalled writes Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix write deadlock Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix dropped unthrottle interrupts Johan Hovold <johan(a)kernel.org> USB: serial: digi_acceleport: fix write-wakeup deadlocks Johan Hovold <johan(a)kernel.org> USB: serial: mos7720: fix parallel-port state restore Borislav Petkov <bp(a)suse.de> EDAC/amd64: Fix PCI component registration Ard Biesheuvel <ardb(a)kernel.org> crypto: ecdh - avoid unaligned accesses in ecdh_set_secret() Athira Rajeev <atrajeev(a)linux.vnet.ibm.com> powerpc/perf: Exclude kernel samples while counting events in user space. Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: mf6x4: Fix AI end-of-conversion detection Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix list corruption of lcu list Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix list corruption of pavgroup group list Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: prevent inconsistent LCU device data Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix hanging device offline processing Philipp Rudo <prudo(a)linux.ibm.com> s390/kexec_file: fix diag308 subcode when loading crash kernel Sven Schnelle <svens(a)linux.ibm.com> s390/smp: perform initial CPU reset also for SMT siblings Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Disable sample read check if firmware doesn't give back Amadej Kastelic <amadejkastelic7(a)gmail.com> ALSA: usb-audio: Add VID to support native DSD reproduction on FiiO devices Chris Chiu <chiu(a)endlessos.org> ALSA: hda/realtek: Apply jack fixup for Quanta NL3 Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek: Add quirk for MSI-GP73 Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: oss: Fix a few more UBSAN fixes Chris Chiu <chiu(a)endlessos.org> ALSA: hda/realtek - Enable headset mic of ASUS Q524UQK with ALC255 Chris Chiu <chiu(a)endlessos.org> ALSA: hda/realtek - Enable headset mic of ASUS X430UN with ALC256 Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix regressions on clear and reconfig sysfs Hui Wang <hui.wang(a)canonical.com> ACPI: PNP: compare the string length in the matching_id() Daniel Scally <djrscally(a)gmail.com> Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup() Connor McAdams <conmanx360(a)gmail.com> ALSA: hda/ca0132 - Change Input Source enum strings. Arnd Bergmann <arnd(a)arndb.de> Input: cyapa_gen6 - fix out-of-bounds stack access Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Make the field on subdev format V4L2_FIELD_NONE Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Validate mbus format in setting subdev format Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Serialise access to pad format Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Return actual subdev format Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Remove traces of returned buffers Lukas Wunner <lukas(a)wunner.de> media: netup_unidvb: Don't leak SPI master in probe error path Sean Young <sean(a)mess.org> media: sunxi-cir: ensure IR is handled when it is continuous Alan Stern <stern(a)rowland.harvard.edu> media: gspca: Fix memory leak in probe Simon Beginn <linux(a)simonmicro.de> Input: goodix - add upside-down quirk for Teclast X98 Pro tablet Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: cros_ec_keyb - send 'scancodes' in addition to key events Dongdong Wang <wangdongdong.6(a)bytedance.com> lwt: Disable BH too in run_lwt_bpf() Serge Hallyn <shallyn(a)cisco.com> fix namespaced fscaps when !CONFIG_SECURITY Sara Sharon <sara.sharon(a)intel.com> cfg80211: initialize rekey_data Paul Kocialkowski <contact(a)paulk.fr> ARM: sunxi: Add machine match for the Allwinner V3 SoC Masahiro Yamada <masahiroy(a)kernel.org> kconfig: fix return value of do_error_if() Jernej Skrabec <jernej.skrabec(a)siol.net> clk: sunxi-ng: Make sure divider tables have sentinel Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> clk: s2mps11: Fix a resource leak in error handling paths in the probe function Dan Carpenter <dan.carpenter(a)oracle.com> qlcnic: Fix error code in probe Zheng Zengkai <zhengzengkai(a)huawei.com> perf record: Fix memory leak when using '--user-regs=?' to list registers Lokesh Vutla <lokeshvutla(a)ti.com> pwm: lp3943: Dynamically allocate PWM chip base Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: zx: Add missing cleanup in error path Zhang Qilong <zhangqilong3(a)huawei.com> clk: ti: Fix memleak in ti_fapll_synth_setup Arnd Bergmann <arnd(a)arndb.de> watchdog: coh901327: add COMMON_CLK dependency Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> watchdog: qcom: Avoid context switch in restart handler Zhang Qilong <zhangqilong3(a)huawei.com> libnvdimm/label: Return -ENXIO for no slot in __blk_label_update Vincent Stehlé <vincent.stehle(a)laposte.net> net: korina: fix return value Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: bcmgenet: Fix a resource leak in an error handling path in the probe functin Dwaipayan Ray <dwaipayanray1(a)gmail.com> checkpatch: fix unescaped left brace Vincent Stehlé <vincent.stehle(a)laposte.net> powerpc/ps3: use dma_mapping_error() Bongsu Jeon <bongsu.jeon(a)samsung.com> nfc: s3fwrn5: Release the nfc firmware Anton Ivanov <anton.ivanov(a)cambridgegreys.com> um: chan_xterm: Fix fd leak Anton Ivanov <anton.ivanov(a)cambridgegreys.com> um: tty: Fix handling of close in tty lines Anton Ivanov <anton.ivanov(a)cambridgegreys.com> um: Monitor error events in IRQ controller Wang Wensheng <wangwensheng4(a)huawei.com> watchdog: Fix potential dereferencing of null pointer Lingling Xu <ling_ling.xu(a)unisoc.com> watchdog: sprd: check busy bit before new loading rather than after that Lingling Xu <ling_ling.xu(a)unisoc.com> watchdog: sprd: remove watchdog disable from resume fail path Guenter Roeck <linux(a)roeck-us.net> watchdog: sirfsoc: Add missing dependency on HAS_IOMEM Marc Zyngier <maz(a)kernel.org> irqchip/alpine-msi: Fix freeing of interrupts on allocation error path Dan Carpenter <dan.carpenter(a)oracle.com> ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() Johannes Berg <johannes.berg(a)intel.com> mac80211: don't set set TDLS STA bandwidth wider than possible Marek Szyprowski <m.szyprowski(a)samsung.com> extcon: max77693: Fix modalias string Dmitry Osipenko <digetx(a)gmail.com> clk: tegra: Fix duplicated SE clock entry Zhang Changzhong <zhangchangzhong(a)huawei.com> bus: fsl-mc: fix error return code in fsl_mc_object_allocate() Masami Hiramatsu <mhiramat(a)kernel.org> x86/kprobes: Restore BTF if the single-stepping is cancelled Cheng Lin <cheng.lin130(a)zte.com.cn> nfs_common: need lock during iterate through the list kazuo ito <kzpn200(a)gmail.com> nfsd: Fix message level for normal termination Yang Yingliang <yangyingliang(a)huawei.com> speakup: fix uninitialized flush_lock Zhang Qilong <zhangqilong3(a)huawei.com> usb: oxu210hp-hcd: Fix memory leak in oxu_create Zhang Qilong <zhangqilong3(a)huawei.com> usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries/hibernation: remove redundant cacheinfo update Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops Vadim Pasternak <vadimp(a)nvidia.com> platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems Zhang Changzhong <zhangchangzhong(a)huawei.com> scsi: fnic: Fix error return code in fnic_probe() Arnd Bergmann <arnd(a)arndb.de> seq_buf: Avoid type mismatch for seq_buf_init Zhang Qilong <zhangqilong3(a)huawei.com> scsi: pm80xx: Fix error return in pm8001_pci_probe() Qinglang Miao <miaoqinglang(a)huawei.com> scsi: qedi: Fix missing destroy_workqueue() on error in __qedi_probe Pali Rohár <pali(a)kernel.org> cpufreq: scpi: Add missing MODULE_ALIAS Pali Rohár <pali(a)kernel.org> cpufreq: loongson1: Add missing MODULE_ALIAS Pali Rohár <pali(a)kernel.org> cpufreq: st: Add missing MODULE_DEVICE_TABLE Pali Rohár <pali(a)kernel.org> cpufreq: mediatek: Add missing MODULE_DEVICE_TABLE Pali Rohár <pali(a)kernel.org> cpufreq: highbank: Add missing MODULE_DEVICE_TABLE Keqian Zhu <zhukeqian1(a)huawei.com> clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Qinglang Miao <miaoqinglang(a)huawei.com> dm ioctl: fix error return code in target_message Chuhong Yuan <hslester96(a)gmail.com> ASoC: jz4740-i2s: add missed checks for clk_get() Leon Romanovsky <leonro(a)nvidia.com> net/mlx5: Properly convey driver version to firmware Jing Xiangfeng <jingxiangfeng(a)huawei.com> memstick: r592: Fix error return in r592_probe() Chen-Yu Tsai <wens(a)csie.org> arm64: dts: rockchip: Fix UART pull-ups on rk3328 Yu Kuai <yukuai3(a)huawei.com> pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() Claudiu Beznea <claudiu.beznea(a)microchip.com> ARM: dts: at91: sama5d2: map securam as device Yu Kuai <yukuai3(a)huawei.com> clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() Dan Carpenter <dan.carpenter(a)oracle.com> media: saa7146: fix array overflow in vidioc_s_audio() Jason Gunthorpe <jgg(a)nvidia.com> vfio-pci: Use io_remap_pfn_range() for PCI IO memory NeilBrown <neilb(a)suse.de> NFS: switch nfsiod to be an UNBOUND workqueue. Calum Mackay <calum.mackay(a)oracle.com> lockd: don't use interval-based rebinding over TCP Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: xprt_load_transport() needs to support the netid "rdma6" Olga Kornievskaia <kolga(a)netapp.com> NFSv4.2: condition READDIR's mask for security label based on LSM state Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> ath10k: Release some resources in an error handling path Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> ath10k: Fix an error handling path Rakesh Pillai <pillair(a)codeaurora.org> ath10k: Fix the parsing error in service available event Qinglang Miao <miaoqinglang(a)huawei.com> platform/x86: dell-smbios-base: Fix error return code in dell_smbios_init Alexandre Belloni <alexandre.belloni(a)bootlin.com> ARM: dts: at91: at91sam9rl: fix ADC triggers Artem Lapkin <art(a)khadas.com> arm64: dts: meson: fix spi-max-frequency on Khadas VIM2 Bharat Gooty <bharat.gooty(a)broadcom.com> PCI: iproc: Fix out-of-bound array accesses Colin Ian King <colin.king(a)canonical.com> PCI: Fix overflow in command-line resource alignment requests Bjorn Helgaas <bhelgaas(a)google.com> PCI: Bounds-check command-line resource alignment requests Marc Zyngier <maz(a)kernel.org> genirq/irqdomain: Don't try to free an interrupt that has no mapping Zhang Qilong <zhangqilong3(a)huawei.com> power: supply: bq24190_charger: fix reference leak Hans de Goede <hdegoede(a)redhat.com> power: supply: axp288_charger: Fix HP Pavilion x2 10 DMI matching Chen-Yu Tsai <wens(a)csie.org> arm64: dts: rockchip: Set dr_mode to "host" for OTG on rk3328-roc-cc Chris Packham <chris.packham(a)alliedtelesis.co.nz> ARM: dts: Remove non-existent i2c1 from 98dx3236 Jing Xiangfeng <jingxiangfeng(a)huawei.com> HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() Bjorn Andersson <bjorn.andersson(a)linaro.org> slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI Dan Carpenter <dan.carpenter(a)oracle.com> media: max2175: fix max2175_set_csm_mode() error code Qinglang Miao <miaoqinglang(a)huawei.com> mips: cdmm: fix use-after-free in mips_cdmm_bus_discover Daniel T. Lee <danieltimlee(a)gmail.com> samples: bpf: Fix lwt_len_hist reusing previous BPF map Vadim Pasternak <vadimp(a)nvidia.com> platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration Vadim Pasternak <vadimp(a)nvidia.com> platform/x86: mlx-platform: Remove PSU EEPROM from default platform configuration Keita Suzuki <keitasuzuki.park(a)sslab.ics.keio.ac.jp> media: siano: fix memory leak of debugfs members in smsdvb_hotplug Zhihao Cheng <chengzhihao1(a)huawei.com> dmaengine: mv_xor_v2: Fix error return code in mv_xor_v2_probe() Qinglang Miao <miaoqinglang(a)huawei.com> cw1200: fix missing destroy_workqueue() on error in cw1200_init_common Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> orinoco: Move context allocation after processing the skb Cristian Birsan <cristian.birsan(a)microchip.com> ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host Cristian Birsan <cristian.birsan(a)microchip.com> ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host Qinglang Miao <miaoqinglang(a)huawei.com> memstick: fix a double-free bug in memstick_check Kamal Heib <kamalheib1(a)gmail.com> RDMA/cxgb4: Validate the number of CQEs Zhang Qilong <zhangqilong3(a)huawei.com> Input: omap4-keypad - fix runtime PM error handling Zhihao Cheng <chengzhihao1(a)huawei.com> drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe Zhang Qilong <zhangqilong3(a)huawei.com> soc: ti: Fix reference imbalance in knav_dma_probe Zhang Qilong <zhangqilong3(a)huawei.com> soc: ti: knav_qmss: fix reference leak in knav_queue_probe Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> spi: fix resource leak for drivers without .remove callback Zhang Qilong <zhangqilong3(a)huawei.com> crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe Nathan Chancellor <natechancellor(a)gmail.com> crypto: crypto4xx - Replace bitwise OR with logical OR in crypto4xx_build_pd Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 Zhang Qilong <zhangqilong3(a)huawei.com> spi: mxs: fix reference leak in mxs_spi_probe Yang Yingliang <yangyingliang(a)huawei.com> usb/max3421: fix return error code in max3421_probe() Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: ads7846 - fix unaligned access on 7845 Oleksij Rempel <o.rempel(a)pengutronix.de> Input: ads7846 - fix integer overflow on Rt calculation David Jander <david(a)protonic.nl> Input: ads7846 - fix race that causes missing releases Yang Yingliang <yangyingliang(a)huawei.com> drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() Yang Yingliang <yangyingliang(a)huawei.com> video: fbdev: atmel_lcdfb: fix return error code in atmel_lcdfb_of_init() Qinglang Miao <miaoqinglang(a)huawei.com> media: solo6x10: fix missing snd_card_free in error handling case Martin Wilck <mwilck(a)suse.com> scsi: core: Fix VPD LUN ID designator priorities Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: fix COMPILE_TEST error Yu Kuai <yukuai3(a)huawei.com> media: mtk-vcodec: add missing put_device() call in mtk_vcodec_release_dec_pm() Colin Ian King <colin.king(a)canonical.com> media: tm6000: Fix sizeof() mismatches Jing Xiangfeng <jingxiangfeng(a)huawei.com> staging: gasket: interrupt: fix the missed eventfd_ctx_put() in gasket_interrupt.c Zhang Qilong <zhangqilong3(a)huawei.com> staging: greybus: codecs: Fix reference counter leak in error handling Jack Xu <jack.xu(a)intel.com> crypto: qat - fix status check in qat_hal_put_rel_rd_xfer() Necip Fazil Yildiran <fazilyildiran(a)gmail.com> MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA Arnd Bergmann <arnd(a)arndb.de> RDMa/mthca: Work around -Wenum-conversion warning Zhang Qilong <zhangqilong3(a)huawei.com> ASoC: arizona: Fix a wrong free in wm8997_probe Vincent Bernat <vincent(a)bernat.ch> net: evaluate net.ipv4.conf.all.proxy_arp_pvlan Vincent Bernat <vincent(a)bernat.ch> net: evaluate net.ipvX.conf.all.ignore_routes_with_linkdown Zhang Qilong <zhangqilong3(a)huawei.com> ASoC: wm8998: Fix PM disable depth imbalance on error Tsuchiya Yuto <kitakar(a)gmail.com> mwifiex: fix mwifiex_shutdown_sw() causing sw reset failure Qinglang Miao <miaoqinglang(a)huawei.com> spi: bcm63xx-hsspi: fix missing clk_disable_unprepare() on error in bcm63xx_hsspi_resume Zhang Qilong <zhangqilong3(a)huawei.com> spi: tegra114: fix reference leak in tegra spi ops Zhang Qilong <zhangqilong3(a)huawei.com> spi: tegra20-sflash: fix reference leak in tegra_sflash_resume Zhang Qilong <zhangqilong3(a)huawei.com> spi: tegra20-slink: fix reference leak in slink ops of tegra20 Zhang Qilong <zhangqilong3(a)huawei.com> spi: spi-ti-qspi: fix reference leak in ti_qspi_setup Anant Thazhemadam <anant.thazhemadam(a)gmail.com> Bluetooth: hci_h5: fix memory leak in h5_close Anmol Karn <anmol.karan123(a)gmail.com> Bluetooth: Fix null pointer dereference in hci_event_packet() Paweł Chmiel <pawel.mikolaj.chmiel(a)gmail.com> arm64: dts: exynos: Correct psci compatible used on Exynos7 Paweł Chmiel <pawel.mikolaj.chmiel(a)gmail.com> arm64: dts: exynos: Include common syscon restart/poweroff for Exynos7 Paul Moore <paul(a)paul-moore.com> selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling Cezary Rojewski <cezary.rojewski(a)intel.com> ASoC: pcm: DRAIN support reactivation Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dsi_pll_10nm: restore VCO rate during restore_state Zhang Qilong <zhangqilong3(a)huawei.com> spi: img-spfi: fix reference leak in img_spfi_resume Jordan Niethe <jniethe5(a)gmail.com> powerpc/64: Set up a kernel stack for secondaries before cpu_restore() Arnd Bergmann <arnd(a)arndb.de> drm/amdgpu: fix build_coefficients() argument Colin Ian King <colin.king(a)canonical.com> crypto: inside-secure - Fix sizeof() mismatch Christophe Leroy <christophe.leroy(a)csgroup.eu> crypto: talitos - Fix return type of current_desc_hdr() Christophe Leroy <christophe.leroy(a)csgroup.eu> crypto: talitos - Endianess in current_desc_hdr() Thomas Gleixner <tglx(a)linutronix.de> sched: Reenable interrupts in do_sched_yield() Peng Liu <iwtbavbm(a)gmail.com> sched/deadline: Fix sched_dl_global_validate() David Woodhouse <dwmw(a)amazon.co.uk> x86/apic: Fix x2apic enablement without interrupt remapping Ard Biesheuvel <ardb(a)kernel.org> ARM: p2v: fix handling of LPAE translation in BE mode Arvind Sankar <nivedita(a)alum.mit.edu> x86/mm/ident_map: Check for errors from ident_pud_init() Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Compute PSN windows correctly Joel Stanley <joel(a)jms.id.au> ARM: dts: aspeed: s2600wf: Fix VGA memory region location Tianyue Ren <rentianyue(a)kylinos.cn> selinux: fix error initialization in inode_doinit_with_dentry() Kamal Heib <kamalheib1(a)gmail.com> RDMA/bnxt_re: Set queue pair state when being queried Douglas Anderson <dianders(a)chromium.org> soc: qcom: geni: More properly switch to DMA mode Nicolas Boichat <drinkcat(a)chromium.org> soc: mediatek: Check if power domains can be powered on at boot time Dan Carpenter <dan.carpenter(a)oracle.com> soc: renesas: rmobile-sysc: Fix some leaks in rmobile_init_pm_domains() Krzysztof Kozlowski <krzk(a)kernel.org> drm/tve200: Fix handling of platform_get_irq() error Tom Rix <trix(a)redhat.com> drm/gma500: fix double free of gma_connector Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Move definition of 'traceid_list' global variable from header file Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata Dae R. Jeong <dae.r.jeong(a)kaist.ac.kr> md: fix a warning caused by a race between concurrent md_ioctl()s Eric Biggers <ebiggers(a)google.com> crypto: af_alg - avoid undefined behavior accessing salg_name Antti Palosaari <crope(a)iki.fi> media: msi2500: assign SPI bus number dynamically Jan Kara <jack(a)suse.cz> quota: Sanity-check quota file headers on load Peilin Ye <yepeilin.cs(a)gmail.com> Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() Alexey Kardashevskiy <aik(a)ozlabs.ru> serial_core: Check for port state when tty is in error state Julian Sax <jsbc(a)gmx.de> HID: i2c-hid: add Vero K147 to descriptor override Arnd Bergmann <arnd(a)arndb.de> scsi: megaraid_sas: Check user-provided offsets Mao Jinlong <jinlmao(a)codeaurora.org> coresight: tmc-etr: Check if page is valid before dma_map_page() Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU Fabio Estevam <festevam(a)gmail.com> usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul Will McVicker <willmcvicker(a)google.com> USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Jack Pham <jackp(a)codeaurora.org> usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus Will McVicker <willmcvicker(a)google.com> USB: gadget: f_midi: setup SuperSpeed Plus descriptors taehyun.cho <taehyun.cho(a)samsung.com> USB: gadget: f_acm: add support for SuperSpeed Plus Johan Hovold <johan(a)kernel.org> USB: serial: option: add interface-number sanity check to flag handling Nicolin Chen <nicoleotsuka(a)gmail.com> soc/tegra: fuse: Fix index bug in get_process_id Thomas Gleixner <tglx(a)linutronix.de> dm table: Remove BUG_ON(in_interrupt()) Sreekanth Reddy <sreekanth.reddy(a)broadcom.com> scsi: mpt3sas: Increase IOCInit request timeout to 30s Sven Eckelmann <sven(a)narfation.org> vxlan: Copy needed_tailroom from lowerdev Sven Eckelmann <sven(a)narfation.org> vxlan: Add needed_headroom for lower device Mark Rutland <mark.rutland(a)arm.com> arm64: syscall: exit userspace before unmasking exceptions Qinglang Miao <miaoqinglang(a)huawei.com> drm/tegra: sor: Disable clocks on error in tegra_sor_init() Nicholas Piggin <npiggin(a)gmail.com> kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling Deepak R Varma <mh12gx2825(a)gmail.com> drm/tegra: replace idr_init() by idr_init_base() Björn Töpel <bjorn.topel(a)intel.com> ixgbe: avoid premature Rx buffer reuse Leon Romanovsky <leonro(a)nvidia.com> RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait Toke Høiland-Jørgensen <toke(a)redhat.com> selftests/bpf/test_offload.py: Reset ethtool features after failed setting Chunyan Zhang <chunyan.zhang(a)unisoc.com> gpio: eic-sprd: break loop when getting NULL device resource Subash Abhinov Kasiviswanathan <subashab(a)codeaurora.org> netfilter: x_tables: Switch synchronization to RCU Johannes Thumshirn <johannes.thumshirn(a)wdc.com> block: factor out requeue handling from dispatch code Geert Uytterhoeven <geert+renesas(a)glider.be> clk: renesas: r9a06g032: Drop __packed for portability Zhang Qilong <zhangqilong3(a)huawei.com> can: softing: softing_netdev_open(): fix error handling Luc Van Oostenryck <luc.vanoostenryck(a)gmail.com> xsk: Fix xsk_poll()'s return type Randy Dunlap <rdunlap(a)infradead.org> scsi: bnx2i: Requires MMU Baruch Siach <baruch(a)tkos.co.il> gpio: mvebu: fix potential user-after-free on probe Icenowy Zheng <icenowy(a)aosc.io> ARM: dts: sun8i: v3s: fix GIC node memory range Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: baytrail: Avoid clearing debounce value when turning it off Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: merrifield: Set default bias in case no particular value given Xiaochen Shen <xiaochen.shen(a)intel.com> x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled James Morse <james.morse(a)arm.com> x86/resctrl: Remove unused struct mbm_state::chunks_bw Fangrui Song <maskray(a)google.com> arm64: Change .weak to SYM_FUNC_START_WEAK_PI for arch/arm64/lib/mem*.S Vincenzo Frascino <vincenzo.frascino(a)arm.com> arm64: lse: Fix LSE atomics with LLVM Sami Tolvanen <samitolvanen(a)google.com> arm64: lse: fix LSE atomics with LLVM's integrated assembler Xin Xiong <xiongx18(a)fudan.edu.cn> drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi Oleksandr Andrushchenko <oleksandr_andrushchenko(a)epam.com> drm/xen-front: Fix misused IS_ERR_OR_NULL checks Alexander Sverdlin <alexander.sverdlin(a)gmail.com> serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: oss: Fix potential out-of-bounds shift Thomas Gleixner <tglx(a)linutronix.de> USB: sisusbvga: Make console support depend on BROKEN Oliver Neukum <oneukum(a)suse.com> USB: UAS: introduce a quirk to set no_write_same Li Jun <jun.li(a)nxp.com> xhci: Give USB2 ports time to enter U3 in bus suspend Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix control 'access overflow' errors from chmap Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix potential out-of-bounds shift Oliver Neukum <oneukum(a)suse.com> USB: add RESET_RESUME quirk for Snapscan 1212 Bui Quang Minh <minhquangbui99(a)gmail.com> USB: dummy-hcd: Fix uninitialized array use in init() Steven Rostedt (VMware) <rostedt(a)goodmis.org> ktest.pl: If size of log is too big to email, email error message Zhang Changzhong <zhangchangzhong(a)huawei.com> net: bridge: vlan: fix error return code in __vlan_add() Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux Fugang Duan <fugang.duan(a)nxp.com> net: stmmac: delete the eee_ctrl_timer after napi disabled Moshe Shemesh <moshe(a)mellanox.com> net/mlx4_en: Handle TX error CQE Sergej Bauer <sbauer(a)blackbox.su> lan743x: fix for potential NULL pointer dereference with bare card Moshe Shemesh <moshe(a)mellanox.com> net/mlx4_en: Avoid scheduling restart task if it is already running Neal Cardwell <ncardwell(a)google.com> tcp: fix cwnd-limited bug for TSO deferral where we send nothing Eric Dumazet <edumazet(a)google.com> tcp: select sane initial rcvq_space.space for big MSS Fugang Duan <fugang.duan(a)nxp.com> net: stmmac: free tx skb buffer in stmmac_resume() Eric Dumazet <edumazet(a)google.com> mac80211: mesh: fix mesh_pathtbl_init() error path Ansuel Smith <ansuelsmth(a)gmail.com> PCI: qcom: Add missing reset for ipq806x Arvind Sankar <nivedita(a)alum.mit.edu> compiler.h: fix barrier_data() on clang Thomas Gleixner <tglx(a)linutronix.de> x86/apic/vector: Fix ordering in vector assignment Andy Lutomirski <luto(a)kernel.org> x86/membarrier: Get rid of a dubious optimization Arvind Sankar <nivedita(a)alum.mit.edu> x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP Dan Carpenter <dan.carpenter(a)oracle.com> scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" Arnd Bergmann <arnd(a)arndb.de> kbuild: avoid static_assert for genksyms Bean Huo <beanhuo(a)micron.com> mmc: block: Fixup condition for CMD13 polling for RPMB requests Coiby Xu <coiby.xu(a)gmail.com> pinctrl: amd: remove debounce filter setting in IRQ type setting Chris Chiu <chiu(a)endlessos.org> Input: i8042 - add Acer laptops to the i8042 reset list Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: cm109 - do not stomp on control URB Max Verevkin <me(a)maxverevkin.tk> platform/x86: intel-vbtn: Support for tablet mode on HP Pavilion 13 x360 PC Timo Witte <timo.witte(a)gmail.com> platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Hans de Goede <hdegoede(a)redhat.com> platform/x86: thinkpad_acpi: Add BAT1 is primary battery quirk for Thinkpad Yoga 11e 4th gen Hans de Goede <hdegoede(a)redhat.com> platform/x86: thinkpad_acpi: Do not report SW_TABLET_MODE on Yoga 11e Hao Si <si.hao(a)zte.com.cn> soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) Xu Qiang <xuqiang36(a)huawei.com> irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend Can Guo <cang(a)codeaurora.org> scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE Vineet Gupta <vgupta(a)synopsys.com> ARC: stack unwinding: don't assume non-current task is sleeping Michael Ellerman <mpe(a)ellerman.id.au> powerpc: Drop -me200 addition to build flags Sara Sharon <sara.sharon(a)intel.com> iwlwifi: mvm: fix kernel panic in case of assert during CSA Markus Reichl <m.reichl(a)fivetechno.de> arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: limit memory read spin time Nathan Chancellor <natechancellor(a)gmail.com> spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe Lukas Wunner <lukas(a)wunner.de> spi: bcm2835aux: Fix use-after-free on unbind Fangrui Song <maskray(a)google.com> x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S Nick Desaulniers <ndesaulniers(a)google.com> Kbuild: do not emit debug info for assembly with LLVM_IAS=1 ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 1 + Documentation/networking/ip-sysctl.txt | 3 + Makefile | 7 +- arch/arc/kernel/stacktrace.c | 23 ++-- arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 5 - arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 ++ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 ++ arch/arm/boot/dts/at91sam9rl.dtsi | 19 ++-- arch/arm/boot/dts/exynos5410-odroidxu.dts | 6 +- arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 +++++ arch/arm/boot/dts/exynos5410.dtsi | 4 + arch/arm/boot/dts/omap4-panda-es.dts | 2 +- arch/arm/boot/dts/sama5d2.dtsi | 7 +- arch/arm/boot/dts/sun8i-v3s.dtsi | 2 +- arch/arm/kernel/head.S | 6 +- arch/arm/mach-shmobile/pm-rmobile.c | 1 + arch/arm/mach-sunxi/sunxi.c | 1 + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- arch/arm64/boot/dts/exynos/exynos7.dtsi | 12 +- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 16 +-- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 + arch/arm64/include/asm/atomic_lse.h | 76 +++++++++---- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/lse.h | 6 +- arch/arm64/kernel/syscall.c | 2 +- arch/arm64/kvm/sys_regs.c | 1 + arch/arm64/lib/memcpy.S | 3 +- arch/arm64/lib/memmove.S | 3 +- arch/arm64/lib/memset.S | 3 +- arch/mips/bcm47xx/Kconfig | 1 + arch/powerpc/Makefile | 1 - arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- arch/powerpc/include/asm/cputable.h | 5 - arch/powerpc/include/asm/nohash/pgtable.h | 4 +- arch/powerpc/kernel/head_64.S | 8 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 4 +- arch/powerpc/perf/core-book3s.c | 10 ++ arch/powerpc/platforms/powernv/memtrace.c | 44 +++++-- arch/powerpc/platforms/pseries/suspend.c | 4 - arch/powerpc/xmon/nonstdio.c | 2 +- arch/s390/kernel/smp.c | 18 +-- arch/s390/purgatory/head.S | 9 +- arch/um/drivers/chan_user.c | 4 +- arch/um/drivers/xterm.c | 5 + arch/um/os-Linux/irq.c | 2 +- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/sync_core.h | 9 +- arch/x86/kernel/apic/apic.c | 14 ++- arch/x86/kernel/apic/vector.c | 24 ++-- arch/x86/kernel/apic/x2apic_phys.c | 9 ++ arch/x86/kernel/cpu/intel_rdt.h | 2 - arch/x86/kernel/cpu/intel_rdt_monitor.c | 7 +- arch/x86/kernel/kprobes/core.c | 5 + arch/x86/lib/memcpy_64.S | 6 +- arch/x86/lib/memmove_64.S | 4 +- arch/x86/lib/memset_64.S | 6 +- arch/x86/mm/ident_map.c | 12 +- arch/x86/mm/mem_encrypt_identity.c | 4 +- arch/x86/mm/tlb.c | 10 +- block/blk-mq.c | 29 +++-- crypto/af_alg.c | 10 +- crypto/ecdh.c | 9 +- drivers/acpi/acpi_pnp.c | 3 + drivers/acpi/device_pm.c | 41 ++----- drivers/acpi/resource.c | 2 +- drivers/block/xen-blkback/xenbus.c | 4 +- drivers/bluetooth/hci_h5.c | 3 + drivers/bus/fsl-mc/fsl-mc-allocator.c | 4 +- drivers/bus/mips_cdmm.c | 4 +- drivers/clk/clk-s2mps11.c | 1 + drivers/clk/mvebu/armada-37xx-xtal.c | 4 +- drivers/clk/renesas/r9a06g032-clocks.c | 2 +- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 1 + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 1 + drivers/clk/tegra/clk-id.h | 1 + drivers/clk/tegra/clk-tegra-periph.c | 2 +- drivers/clk/ti/fapll.c | 11 +- drivers/clocksource/arm_arch_timer.c | 23 ++-- drivers/clocksource/cadence_ttc_timer.c | 18 +-- drivers/cpufreq/highbank-cpufreq.c | 7 ++ drivers/cpufreq/loongson1-cpufreq.c | 1 + drivers/cpufreq/mediatek-cpufreq.c | 1 + drivers/cpufreq/scpi-cpufreq.c | 1 + drivers/cpufreq/sti-cpufreq.c | 7 ++ drivers/crypto/amcc/crypto4xx_core.c | 2 +- drivers/crypto/inside-secure/safexcel.c | 2 +- drivers/crypto/omap-aes.c | 3 +- drivers/crypto/qat/qat_common/qat_hal.c | 2 +- drivers/crypto/talitos.c | 10 +- drivers/dma/mv_xor_v2.c | 4 +- drivers/edac/amd64_edac.c | 26 +++-- drivers/extcon/extcon-max77693.c | 2 +- drivers/gpio/gpio-eic-sprd.c | 2 +- drivers/gpio/gpio-mvebu.c | 16 ++- .../drm/amd/display/modules/color/color_gamma.c | 2 +- drivers/gpu/drm/drm_dp_aux_dev.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 7 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 ++ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 + drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tegra/sor.c | 10 +- drivers/gpu/drm/tve200/tve200_drv.c | 4 +- drivers/gpu/drm/xen/xen_drm_front.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 8 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 2 +- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ drivers/hsi/controllers/omap_ssi_core.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 + drivers/iio/adc/rockchip_saradc.c | 2 +- drivers/iio/imu/bmi160/bmi160_core.c | 4 +- drivers/iio/industrialio-buffer.c | 6 +- drivers/iio/light/rpr0521.c | 17 ++- drivers/iio/light/st_uvis25.h | 5 + drivers/iio/light/st_uvis25_core.c | 8 +- drivers/iio/pressure/mpl3115.c | 9 +- drivers/infiniband/core/cm.c | 2 + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 + drivers/infiniband/hw/cxgb4/cq.c | 3 + drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- drivers/infiniband/hw/mthca/mthca_dev.h | 1 - drivers/infiniband/sw/rxe/rxe_req.c | 3 +- drivers/input/keyboard/cros_ec_keyb.c | 1 + drivers/input/keyboard/omap4-keypad.c | 89 +++++++++------ drivers/input/misc/cm109.c | 7 +- drivers/input/mouse/cyapa_gen6.c | 2 +- drivers/input/serio/i8042-x86ia64io.h | 42 +++++++ drivers/input/touchscreen/ads7846.c | 52 +++++---- drivers/input/touchscreen/goodix.c | 12 ++ drivers/irqchip/irq-alpine-msi.c | 3 +- drivers/irqchip/irq-gic-v3-its.c | 16 +-- drivers/md/dm-ioctl.c | 1 + drivers/md/dm-table.c | 6 - drivers/md/md-cluster.c | 67 ++++++----- drivers/md/md.c | 21 +++- drivers/media/common/siano/smsdvb-main.c | 5 +- drivers/media/i2c/max2175.c | 2 +- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 62 +++++----- drivers/media/pci/intel/ipu3/ipu3-cio2.h | 1 + drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 5 +- drivers/media/pci/saa7146/mxb.c | 19 ++-- drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 1 + drivers/media/rc/sunxi-cir.c | 2 + drivers/media/usb/gspca/gspca.c | 1 + drivers/media/usb/msi2500/msi2500.c | 2 +- drivers/media/usb/tm6000/tm6000-video.c | 5 +- drivers/memstick/core/memstick.c | 1 - drivers/memstick/host/r592.c | 12 +- drivers/mmc/core/block.c | 2 +- drivers/mtd/cmdlinepart.c | 14 ++- drivers/mtd/nand/raw/qcom_nandc.c | 2 + drivers/mtd/nand/spi/core.c | 4 + drivers/net/can/softing/softing_main.c | 9 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 7 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 24 ++-- drivers/net/ethernet/korina.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 21 ++-- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 40 +++++-- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 12 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 +- drivers/net/ethernet/microchip/lan743x_ethtool.c | 9 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 ++++- drivers/net/vxlan.c | 3 + drivers/net/wireless/ath/ath10k/usb.c | 7 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 4 +- drivers/net/wireless/ath/ath10k/wmi.c | 9 +- drivers/net/wireless/ath/ath10k/wmi.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 ++++-- .../net/wireless/intersil/orinoco/orinoco_usb.c | 14 +-- drivers/net/wireless/marvell/mwifiex/main.c | 2 + drivers/net/wireless/st/cw1200/main.c | 2 + drivers/net/xen-netback/xenbus.c | 6 +- drivers/nfc/s3fwrn5/firmware.c | 4 +- drivers/nvdimm/label.c | 13 ++- drivers/pci/controller/dwc/pcie-qcom.c | 12 ++ drivers/pci/controller/pcie-iproc.c | 10 +- drivers/pci/pci-acpi.c | 4 +- drivers/pci/pci.c | 14 ++- drivers/pci/slot.c | 6 +- drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +- drivers/pinctrl/intel/pinctrl-merrifield.c | 8 ++ drivers/pinctrl/pinctrl-amd.c | 7 -- drivers/pinctrl/pinctrl-falcon.c | 14 ++- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 +- drivers/platform/x86/acer-wmi.c | 1 + drivers/platform/x86/dell-smbios-base.c | 1 + drivers/platform/x86/intel-vbtn.c | 12 ++ drivers/platform/x86/mlx-platform.c | 16 +-- drivers/platform/x86/thinkpad_acpi.c | 10 +- drivers/power/supply/axp288_charger.c | 28 +++-- drivers/power/supply/bq24190_charger.c | 20 +++- drivers/ps3/ps3stor_lib.c | 2 +- drivers/pwm/pwm-lp3943.c | 1 + drivers/pwm/pwm-zx.c | 1 + drivers/s390/block/dasd_alias.c | 22 +++- drivers/scsi/be2iscsi/be_main.c | 4 +- drivers/scsi/bnx2i/Kconfig | 1 + drivers/scsi/fnic/fnic_main.c | 1 + drivers/scsi/lpfc/lpfc_mem.c | 6 +- drivers/scsi/lpfc/lpfc_sli.c | 10 +- drivers/scsi/megaraid/megaraid_sas_base.c | 16 ++- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 3 +- drivers/scsi/qedi/qedi_main.c | 4 +- drivers/scsi/scsi_lib.c | 126 ++++++++++++++------- drivers/scsi/ufs/ufshcd.c | 7 ++ drivers/slimbus/qcom-ngd-ctrl.c | 6 + drivers/soc/fsl/dpio/dpio-driver.c | 5 +- drivers/soc/mediatek/mtk-scpsys.c | 5 +- drivers/soc/qcom/qcom-geni-se.c | 17 ++- drivers/soc/qcom/smp2p.c | 5 +- drivers/soc/tegra/fuse/speedo-tegra210.c | 2 +- drivers/soc/ti/knav_dma.c | 13 ++- drivers/soc/ti/knav_qmss_queue.c | 4 +- drivers/spi/spi-bcm2835aux.c | 17 +-- drivers/spi/spi-bcm63xx-hsspi.c | 4 +- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi-img-spfi.c | 4 +- drivers/spi/spi-mxs.c | 1 + drivers/spi/spi-pic32.c | 1 + drivers/spi/spi-rb4xx.c | 2 +- drivers/spi/spi-sc18is602.c | 13 +-- drivers/spi/spi-sh.c | 13 +-- drivers/spi/spi-st-ssc4.c | 5 +- drivers/spi/spi-tegra114.c | 2 + drivers/spi/spi-tegra20-sflash.c | 1 + drivers/spi/spi-tegra20-slink.c | 2 + drivers/spi/spi-ti-qspi.c | 1 + drivers/spi/spi.c | 19 ++-- drivers/staging/comedi/drivers/mf6x4.c | 3 +- drivers/staging/gasket/gasket_interrupt.c | 15 ++- drivers/staging/greybus/audio_codec.c | 2 + drivers/staging/mt7621-spi/spi-mt7621.c | 2 + drivers/staging/speakup/speakup_dectlk.c | 2 +- drivers/tty/serial/8250/8250_omap.c | 5 - drivers/tty/serial/serial_core.c | 4 + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +- drivers/usb/core/quirks.c | 3 + drivers/usb/gadget/function/f_acm.c | 2 +- drivers/usb/gadget/function/f_fs.c | 5 +- drivers/usb/gadget/function/f_midi.c | 6 + drivers/usb/gadget/function/f_rndis.c | 4 +- drivers/usb/gadget/udc/dummy_hcd.c | 2 +- drivers/usb/host/ehci-omap.c | 1 + drivers/usb/host/max3421-hcd.c | 3 +- drivers/usb/host/oxu210hp-hcd.c | 4 +- drivers/usb/host/xhci-hub.c | 4 + drivers/usb/misc/sisusbvga/Kconfig | 2 +- drivers/usb/serial/digi_acceleport.c | 45 +++----- drivers/usb/serial/keyspan_pda.c | 63 ++++++----- drivers/usb/serial/mos7720.c | 2 + drivers/usb/serial/option.c | 23 +++- drivers/usb/storage/uas.c | 3 + drivers/usb/storage/unusual_uas.h | 7 +- drivers/usb/storage/usb.c | 3 + drivers/vfio/pci/vfio_pci.c | 4 +- drivers/video/fbdev/atmel_lcdfb.c | 2 +- drivers/watchdog/Kconfig | 3 +- drivers/watchdog/qcom-wdt.c | 2 +- drivers/watchdog/sprd_wdt.c | 34 +++--- drivers/watchdog/watchdog_core.c | 22 ++-- drivers/xen/xen-pciback/xenbus.c | 2 +- drivers/xen/xenbus/xenbus.h | 2 + drivers/xen/xenbus/xenbus_client.c | 8 +- drivers/xen/xenbus/xenbus_probe.c | 1 + drivers/xen/xenbus/xenbus_probe_backend.c | 7 ++ drivers/xen/xenbus/xenbus_xs.c | 34 ++++-- fs/ceph/caps.c | 11 +- fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 7 +- fs/cifs/smb2pdu.h | 14 ++- fs/ext4/inode.c | 19 +++- fs/ext4/mballoc.c | 1 + fs/jffs2/readinode.c | 16 +++ fs/jfs/jfs_dmap.h | 2 +- fs/lockd/host.c | 20 ++-- fs/nfs/inode.c | 2 +- fs/nfs/nfs4proc.c | 10 +- fs/nfs_common/grace.c | 6 +- fs/nfsd/nfssvc.c | 3 +- fs/quota/quota_v2.c | 19 ++++ fs/ubifs/io.c | 13 ++- include/acpi/acpi_bus.h | 5 - include/linux/build_bug.h | 5 + include/linux/compiler-clang.h | 1 - include/linux/compiler-gcc.h | 19 ---- include/linux/compiler.h | 18 ++- include/linux/inetdevice.h | 4 +- include/linux/netfilter/x_tables.h | 5 +- include/linux/security.h | 2 +- include/linux/seq_buf.h | 2 +- include/linux/sunrpc/xprt.h | 1 + include/linux/trace_seq.h | 4 +- include/linux/usb_usual.h | 2 + include/uapi/linux/if_alg.h | 16 +++ include/xen/xenbus.h | 15 ++- kernel/cpu.c | 6 +- kernel/irq/irqdomain.c | 11 +- kernel/sched/core.c | 6 +- kernel/sched/deadline.c | 5 +- kernel/sched/sched.h | 42 +++---- net/bluetooth/hci_event.c | 17 +-- net/bridge/br_vlan.c | 4 +- net/core/lwt_bpf.c | 8 +- net/ipv4/netfilter/arp_tables.c | 14 +-- net/ipv4/netfilter/ip_tables.c | 14 +-- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_output.c | 9 +- net/ipv6/netfilter/ip6_tables.c | 14 +-- net/mac80211/mesh_pathtbl.c | 4 +- net/mac80211/vht.c | 14 ++- net/netfilter/x_tables.c | 49 +++----- net/sunrpc/xprt.c | 65 ++++++++--- net/sunrpc/xprtrdma/module.c | 1 + net/sunrpc/xprtrdma/transport.c | 1 + net/sunrpc/xprtsock.c | 4 + net/wireless/nl80211.c | 2 +- net/xdp/xsk.c | 8 +- samples/bpf/lwt_len_hist.sh | 2 + samples/bpf/test_lwt_bpf.sh | 0 scripts/checkpatch.pl | 2 +- scripts/kconfig/preprocess.c | 2 +- security/integrity/ima/ima_crypto.c | 20 +--- security/selinux/hooks.c | 16 ++- sound/core/oss/pcm_oss.c | 28 +++-- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_sysfs.c | 2 +- sound/pci/hda/patch_ca0132.c | 2 +- sound/pci/hda/patch_realtek.c | 4 + sound/soc/codecs/wm8997.c | 2 + sound/soc/codecs/wm8998.c | 4 +- sound/soc/codecs/wm_adsp.c | 5 +- sound/soc/jz4740/jz4740-i2s.c | 4 + sound/soc/meson/Kconfig | 2 +- sound/soc/soc-pcm.c | 2 + sound/usb/clock.c | 6 + sound/usb/format.c | 2 + sound/usb/quirks.c | 1 + sound/usb/stream.c | 6 +- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +- tools/perf/util/cs-etm.c | 29 ++++- tools/perf/util/cs-etm.h | 10 +- tools/perf/util/parse-regs-options.c | 2 +- tools/testing/ktest/ktest.pl | 7 +- tools/testing/selftests/bpf/test_offload.py | 1 + 354 files changed, 2093 insertions(+), 1109 deletions(-)

3 years, 4 months

8
356
0 0

[PATCH 3/4] bcache: introduce BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE for large bucket

by Coly Li

When large bucket feature was added, BCH_FEATURE_INCOMPAT_LARGE_BUCKET was introduced into the incompat feature set. It used bucket_size_hi (which was added at the tail of struct cache_sb_disk) to extend current 16bit bucket size to 32bit with existing bucket_size in struct cache_sb_disk. This is not a good idea, there are two obvious problems, - Bucket size is always value power of 2, if store log2(bucket size) in existing bucket_size of struct cache_sb_disk, it is unnecessary to add bucket_size_hi. - Macro csum_set() assumes d[SB_JOURNAL_BUCKETS] is the last member in struct cache_sb_disk, bucket_size_hi was added after d[] which makes csum_set calculate an unexpected super block checksum. To fix the above problems, this patch introduces a new incompat feature bit BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE, when this bit is set, it means bucket_size in struct cache_sb_disk stores the order of power-of-2 bucket size value. When user specifies a bucket size larger than 32768 sectors, BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE will be set to incompat feature set, and bucket_size stores log2(bucket size) more than store the real bucket size value. The obsoleted BCH_FEATURE_INCOMPAT_LARGE_BUCKET won't be used anymore, it is renamed to BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET and still only recognized by kernel driver for legacy compatible purpose. The previous bucket_size_hi is renmaed to obso_bucket_size_hi in struct cache_sb_disk and not used in bcache-tools anymore. For cache device created with BCH_FEATURE_INCOMPAT_LARGE_BUCKET feature, bcache-tools and kernel driver still recognize the feature string and display it as "obso_large_bucket". With this change, the unnecessary extra space extend of bcache on-disk super block can be avoided, and csum_set() may generate expected check sum as well. Fixes: ffa470327572 ("bcache: add bucket_size_hi into struct cache_sb_disk for large bucket") Signed-off-by: Coly Li <colyli(a)suse.de> Cc: stable(a)vger.kernel.org # 5.9+ --- drivers/md/bcache/features.c | 2 +- drivers/md/bcache/features.h | 11 ++++++++--- drivers/md/bcache/super.c | 22 +++++++++++++++++++--- include/uapi/linux/bcache.h | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/drivers/md/bcache/features.c b/drivers/md/bcache/features.c index 6469223f0b77..d636b7b2d070 100644 --- a/drivers/md/bcache/features.c +++ b/drivers/md/bcache/features.c @@ -17,7 +17,7 @@ struct feature { }; static struct feature feature_list[] = { - {BCH_FEATURE_INCOMPAT, BCH_FEATURE_INCOMPAT_LARGE_BUCKET, + {BCH_FEATURE_INCOMPAT, BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE, "large_bucket"}, {0, 0, 0 }, }; diff --git a/drivers/md/bcache/features.h b/drivers/md/bcache/features.h index e73724c2b49b..84fc2c0f0101 100644 --- a/drivers/md/bcache/features.h +++ b/drivers/md/bcache/features.h @@ -13,11 +13,15 @@ /* Feature set definition */ /* Incompat feature set */ -#define BCH_FEATURE_INCOMPAT_LARGE_BUCKET 0x0001 /* 32bit bucket size */ +/* 32bit bucket size, obsoleted */ +#define BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET 0x0001 +/* real bucket size is (1 << bucket_size) */ +#define BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE 0x0002 #define BCH_FEATURE_COMPAT_SUPP 0 #define BCH_FEATURE_RO_COMPAT_SUPP 0 -#define BCH_FEATURE_INCOMPAT_SUPP BCH_FEATURE_INCOMPAT_LARGE_BUCKET +#define BCH_FEATURE_INCOMPAT_SUPP (BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET| \ + BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE) #define BCH_HAS_COMPAT_FEATURE(sb, mask) \ ((sb)->feature_compat & (mask)) @@ -77,7 +81,8 @@ static inline void bch_clear_feature_##name(struct cache_sb *sb) \ ~BCH##_FEATURE_INCOMPAT_##flagname; \ } -BCH_FEATURE_INCOMPAT_FUNCS(large_bucket, LARGE_BUCKET); +BCH_FEATURE_INCOMPAT_FUNCS(obso_large_bucket, OBSO_LARGE_BUCKET); +BCH_FEATURE_INCOMPAT_FUNCS(large_bucket, LOG_LARGE_BUCKET_SIZE); static inline bool bch_has_unknown_compat_features(struct cache_sb *sb) { diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 1804df5c866b..d742eb5dc2e5 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -64,9 +64,25 @@ static unsigned int get_bucket_size(struct cache_sb *sb, struct cache_sb_disk *s { unsigned int bucket_size = le16_to_cpu(s->bucket_size); - if (sb->version >= BCACHE_SB_VERSION_CDEV_WITH_FEATURES && - bch_has_feature_large_bucket(sb)) - bucket_size |= le16_to_cpu(s->bucket_size_hi) << 16; + if (sb->version >= BCACHE_SB_VERSION_CDEV_WITH_FEATURES) { + if (bch_has_feature_large_bucket(sb)) { + unsigned int max, order; + + max = sizeof(unsigned int) * BITS_PER_BYTE - 1; + order = le16_to_cpu(s->bucket_size); + /* + * bcache tool will make sure the overflow won't + * happen, an error message here is enough. + */ + if (order > max) + pr_err("Bucket size (1 << %u) overflows\n", + order); + bucket_size = 1 << order; + } else if (bch_has_feature_obso_large_bucket(sb)) { + bucket_size += + le16_to_cpu(s->obso_bucket_size_hi) << 16; + } + } return bucket_size; } diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 52e8bcb33981..cf7399f03b71 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -213,7 +213,7 @@ struct cache_sb_disk { __le16 keys; }; __le64 d[SB_JOURNAL_BUCKETS]; /* journal buckets */ - __le16 bucket_size_hi; + __le16 obso_bucket_size_hi; /* obsoleted */ }; /* -- 2.26.2

3 years, 4 months

1
0
0 0

[PATCH 2/4] bcache: check unsupported feature sets for bcache register

by Coly Li

This patch adds the check for features which is incompatible for current supported feature sets. Now if the bcache device created by bcache-tools has features that current kernel doesn't support, read_super() will fail with error messoage. E.g. if an unsupported incompatible feature detected, bcache register will fail with dmesg "bcache: register_bcache() error : Unsupported incompatible feature found". Fixes: d721a43ff69c ("bcache: increase super block version for cache device and backing device") Fixes: ffa470327572 ("bcache: add bucket_size_hi into struct cache_sb_disk for large bucket") Signed-off-by: Coly Li <colyli(a)suse.de> Cc: stable(a)vger.kernel.org # 5.9+ --- drivers/md/bcache/features.h | 15 +++++++++++++++ drivers/md/bcache/super.c | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/drivers/md/bcache/features.h b/drivers/md/bcache/features.h index 32c5bbda2f0d..e73724c2b49b 100644 --- a/drivers/md/bcache/features.h +++ b/drivers/md/bcache/features.h @@ -79,6 +79,21 @@ static inline void bch_clear_feature_##name(struct cache_sb *sb) \ BCH_FEATURE_INCOMPAT_FUNCS(large_bucket, LARGE_BUCKET); +static inline bool bch_has_unknown_compat_features(struct cache_sb *sb) +{ + return ((sb->feature_compat & ~BCH_FEATURE_COMPAT_SUPP) != 0); +} + +static inline bool bch_has_unknown_ro_compat_features(struct cache_sb *sb) +{ + return ((sb->feature_ro_compat & ~BCH_FEATURE_RO_COMPAT_SUPP) != 0); +} + +static inline bool bch_has_unknown_incompat_features(struct cache_sb *sb) +{ + return ((sb->feature_incompat & ~BCH_FEATURE_INCOMPAT_SUPP) != 0); +} + int bch_print_cache_set_feature_compat(struct cache_set *c, char *buf, int size); int bch_print_cache_set_feature_ro_compat(struct cache_set *c, char *buf, int size); int bch_print_cache_set_feature_incompat(struct cache_set *c, char *buf, int size); diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index a4752ac410dc..1804df5c866b 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -228,6 +228,20 @@ static const char *read_super(struct cache_sb *sb, struct block_device *bdev, sb->feature_compat = le64_to_cpu(s->feature_compat); sb->feature_incompat = le64_to_cpu(s->feature_incompat); sb->feature_ro_compat = le64_to_cpu(s->feature_ro_compat); + + /* Check incompatible features */ + err = "Unsupported compatible feature found"; + if (bch_has_unknown_compat_features(sb)) + goto err; + + err = "Unsupported read-only compatible feature found"; + if (bch_has_unknown_ro_compat_features(sb)) + goto err; + + err = "Unsupported incompatible feature found"; + if (bch_has_unknown_incompat_features(sb)) + goto err; + err = read_super_common(sb, bdev, s); if (err) goto err; -- 2.26.2

3 years, 4 months

1
0
0 0

[PATCH 1/4] bcache: fix typo from SUUP to SUPP in features.h

by Coly Li

This patch fixes the following typos, from BCH_FEATURE_COMPAT_SUUP to BCH_FEATURE_COMPAT_SUPP from BCH_FEATURE_INCOMPAT_SUUP to BCH_FEATURE_INCOMPAT_SUPP from BCH_FEATURE_INCOMPAT_SUUP to BCH_FEATURE_RO_COMPAT_SUPP Fixes: d721a43ff69c ("bcache: increase super block version for cache device and backing device") Fixes: ffa470327572 ("bcache: add bucket_size_hi into struct cache_sb_disk for large bucket") Signed-off-by: Coly Li <colyli(a)suse.de> Cc: stable(a)vger.kernel.org # 5.9+ --- drivers/md/bcache/features.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/md/bcache/features.h b/drivers/md/bcache/features.h index a1653c478041..32c5bbda2f0d 100644 --- a/drivers/md/bcache/features.h +++ b/drivers/md/bcache/features.h @@ -15,9 +15,9 @@ /* Incompat feature set */ #define BCH_FEATURE_INCOMPAT_LARGE_BUCKET 0x0001 /* 32bit bucket size */ -#define BCH_FEATURE_COMPAT_SUUP 0 -#define BCH_FEATURE_RO_COMPAT_SUUP 0 -#define BCH_FEATURE_INCOMPAT_SUUP BCH_FEATURE_INCOMPAT_LARGE_BUCKET +#define BCH_FEATURE_COMPAT_SUPP 0 +#define BCH_FEATURE_RO_COMPAT_SUPP 0 +#define BCH_FEATURE_INCOMPAT_SUPP BCH_FEATURE_INCOMPAT_LARGE_BUCKET #define BCH_HAS_COMPAT_FEATURE(sb, mask) \ ((sb)->feature_compat & (mask)) -- 2.26.2

3 years, 4 months

1
0
0 0

Re: [PATCH] platform/x86: ideapad-laptop: Add has_touchpad_switch

by Jiaxun Yang

在 2021/1/2 上午1:09, Barnabás Pőcze 写道: > Hi > > > 2021. január 1., péntek 17:08 keltezéssel, Jiaxun Yang írta: > >> [...] >>>> @@ -1006,6 +1018,10 @@ static int ideapad_acpi_add(struct platform_device *pdev) >>>> if (!priv->has_hw_rfkill_switch) >>>> write_ec_cmd(priv->adev->handle, VPCCMD_W_RF, 1); >>>> >>>> + /* The same for Touchpad */ >>>> + if (!priv->has_touchpad_switch) >>>> + write_ec_cmd(priv->adev->handle, VPCCMD_W_TOUCHPAD, 1); >>>> + >>> Shouldn't it be the other way around: `if (priv->has_touchpad_switch)`? >> It is to prevent accidentally disable touchpad on machines that do have EC switch, >> so it's intentional. >> [...] > Sorry, but the explanation not fully clear to me. The commit message seems to > indicate that some models "do not use EC to switch touchpad", and I take that > means that reading from VPCCMD_R_TOUCHPAD will not reflect the actual state of the > touchpad and writing to VPCCMD_W_TOUCHPAD will not change the state of the touchpad. I'm just trying to prevent removing functionality on machines that touchpad can be controlled by EC but also equipped I2C HID touchpad. At least users will have a functional touchpad after that. > > But then why do you still write to VPCCMD_W_TOUCHPAD on devices where supposedly > this does not have any effect (at least not the desired one)? And the part of the > code I made my comment about only runs on machines on which the touchpad supposedly > cannot be controlled by the EC. What am I missing? > > And there is the other problem: on some machines, this patch removes working > functionality. Yeah that's a problem. I just don't want to repeat the story of rfkill whitelist, it ends up with countless machine to be added. Maybe I should specify HID of touchpad as well. Two machines that known to be problematic all have ELAN0634 touchpad. Thanks. - Jiaxun > > > Regards, > Barnabás Pőcze

3 years, 4 months

1
0
0 0

[PATCH 1/2] uapi: move constants from <linux/kernel.h> to <linux/const.h>

by Petr Vorel

and include <linux/const.h> in UAPI headers instead of <linux/kernel.h>. commit a85cbe6159ffc973e5702f70a3bd5185f8f3c38d upstream. The reason is to avoid indirect <linux/sysinfo.h> include when using some network headers: <linux/netlink.h> or others -> <linux/kernel.h> -> <linux/sysinfo.h>. This indirect include causes on MUSL redefinition of struct sysinfo when included both <sys/sysinfo.h> and some of UAPI headers: In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, from ../include/tst_netlink.h:14, from tst_crypto.c:13: x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo' struct sysinfo { ^~~~~~~ In file included from ../include/tst_safe_macros.h:15, from ../include/tst_test.h:93, from tst_crypto.c:11: x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here Link: https://lkml.kernel.org/r/20201015190013.8901-1-petr.vorel@gmail.com Signed-off-by: Petr Vorel <petr.vorel(a)gmail.com> Suggested-by: Rich Felker <dalias(a)aerifal.cx> Acked-by: Rich Felker <dalias(a)libc.org> Cc: Peter Korsgaard <peter(a)korsgaard.com> Cc: Baruch Siach <baruch(a)tkos.co.il> Cc: Florian Weimer <fweimer(a)redhat.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- Hi, could this fix be backported to stable releases? Maybe safer to wait till v5.11 release. Adjusted for stable/linux-5.10.y. Kind regards, Petr include/uapi/linux/const.h | 5 +++++ include/uapi/linux/ethtool.h | 2 +- include/uapi/linux/kernel.h | 9 +-------- include/uapi/linux/lightnvm.h | 2 +- include/uapi/linux/mroute6.h | 2 +- include/uapi/linux/netfilter/x_tables.h | 2 +- include/uapi/linux/netlink.h | 2 +- include/uapi/linux/sysctl.h | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index 5ed721ad5b19..af2a44c08683 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -28,4 +28,9 @@ #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) + +#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + #endif /* _UAPI_LINUX_CONST_H */ diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 9ca87bc73c44..cde753bb2093 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -14,7 +14,7 @@ #ifndef _UAPI_LINUX_ETHTOOL_H #define _UAPI_LINUX_ETHTOOL_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/if_ether.h> diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h index 0ff8f7477847..fadf2db71fe8 100644 --- a/include/uapi/linux/kernel.h +++ b/include/uapi/linux/kernel.h @@ -3,13 +3,6 @@ #define _UAPI_LINUX_KERNEL_H #include <linux/sysinfo.h> - -/* - * 'kernel.h' contains some often-used function prototypes etc - */ -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) -#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) - -#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#include <linux/const.h> #endif /* _UAPI_LINUX_KERNEL_H */ diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h index f9a1be7fc696..ead2e72e5c88 100644 --- a/include/uapi/linux/lightnvm.h +++ b/include/uapi/linux/lightnvm.h @@ -21,7 +21,7 @@ #define _UAPI_LINUX_LIGHTNVM_H #ifdef __KERNEL__ -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/ioctl.h> #else /* __KERNEL__ */ #include <stdio.h> diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h index c36177a86516..a1fd6173e2db 100644 --- a/include/uapi/linux/mroute6.h +++ b/include/uapi/linux/mroute6.h @@ -2,7 +2,7 @@ #ifndef _UAPI__LINUX_MROUTE6_H #define _UAPI__LINUX_MROUTE6_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/sockios.h> #include <linux/in6.h> /* For struct sockaddr_in6. */ diff --git a/include/uapi/linux/netfilter/x_tables.h b/include/uapi/linux/netfilter/x_tables.h index a8283f7dbc51..b8c6bb233ac1 100644 --- a/include/uapi/linux/netfilter/x_tables.h +++ b/include/uapi/linux/netfilter/x_tables.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_X_TABLES_H #define _UAPI_X_TABLES_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #define XT_FUNCTION_MAXNAMELEN 30 diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index c3816ff7bfc3..3d94269bbfa8 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -2,7 +2,7 @@ #ifndef _UAPI__LINUX_NETLINK_H #define _UAPI__LINUX_NETLINK_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/socket.h> /* for __kernel_sa_family_t */ #include <linux/types.h> diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index 27c1ed2822e6..458179df9b27 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h @@ -23,7 +23,7 @@ #ifndef _UAPI_LINUX_SYSCTL_H #define _UAPI_LINUX_SYSCTL_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/compiler.h> -- 2.29.2

3 years, 4 months

1
2
0 0

[PATCH 1/1] uapi: move constants from <linux/kernel.h> to <linux/const.h>

by Petr Vorel

and include <linux/const.h> in UAPI headers instead of <linux/kernel.h>. commit a85cbe6159ffc973e5702f70a3bd5185f8f3c38d upstream. The reason is to avoid indirect <linux/sysinfo.h> include when using some network headers: <linux/netlink.h> or others -> <linux/kernel.h> -> <linux/sysinfo.h>. This indirect include causes on MUSL redefinition of struct sysinfo when included both <sys/sysinfo.h> and some of UAPI headers: In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, from ../include/tst_netlink.h:14, from tst_crypto.c:13: x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo' struct sysinfo { ^~~~~~~ In file included from ../include/tst_safe_macros.h:15, from ../include/tst_test.h:93, from tst_crypto.c:11: x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here Link: https://lkml.kernel.org/r/20201015190013.8901-1-petr.vorel@gmail.com Signed-off-by: Petr Vorel <petr.vorel(a)gmail.com> Suggested-by: Rich Felker <dalias(a)aerifal.cx> Acked-by: Rich Felker <dalias(a)libc.org> Cc: Peter Korsgaard <peter(a)korsgaard.com> Cc: Baruch Siach <baruch(a)tkos.co.il> Cc: Florian Weimer <fweimer(a)redhat.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- Hi, could this fix be backported to stable releases? Maybe safer to wait till v5.11 release. Adjusted for stable/linux-4.19.y. Kind regards, Petr include/uapi/linux/const.h | 5 +++++ include/uapi/linux/ethtool.h | 2 +- include/uapi/linux/kernel.h | 9 +-------- include/uapi/linux/lightnvm.h | 2 +- include/uapi/linux/mroute6.h | 2 +- include/uapi/linux/netfilter/x_tables.h | 2 +- include/uapi/linux/netlink.h | 2 +- include/uapi/linux/sysctl.h | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index 5ed721ad5b19..af2a44c08683 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -28,4 +28,9 @@ #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) + +#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + #endif /* _UAPI_LINUX_CONST_H */ diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index dc69391d2bba..fc21d3726b59 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -14,7 +14,7 @@ #ifndef _UAPI_LINUX_ETHTOOL_H #define _UAPI_LINUX_ETHTOOL_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/if_ether.h> diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h index 0ff8f7477847..fadf2db71fe8 100644 --- a/include/uapi/linux/kernel.h +++ b/include/uapi/linux/kernel.h @@ -3,13 +3,6 @@ #define _UAPI_LINUX_KERNEL_H #include <linux/sysinfo.h> - -/* - * 'kernel.h' contains some often-used function prototypes etc - */ -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) -#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) - -#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#include <linux/const.h> #endif /* _UAPI_LINUX_KERNEL_H */ diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h index f9a1be7fc696..ead2e72e5c88 100644 --- a/include/uapi/linux/lightnvm.h +++ b/include/uapi/linux/lightnvm.h @@ -21,7 +21,7 @@ #define _UAPI_LINUX_LIGHTNVM_H #ifdef __KERNEL__ -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/ioctl.h> #else /* __KERNEL__ */ #include <stdio.h> diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h index 9999cc006390..1617eb9949a5 100644 --- a/include/uapi/linux/mroute6.h +++ b/include/uapi/linux/mroute6.h @@ -2,7 +2,7 @@ #ifndef _UAPI__LINUX_MROUTE6_H #define _UAPI__LINUX_MROUTE6_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/sockios.h> #include <linux/in6.h> /* For struct sockaddr_in6. */ diff --git a/include/uapi/linux/netfilter/x_tables.h b/include/uapi/linux/netfilter/x_tables.h index a8283f7dbc51..b8c6bb233ac1 100644 --- a/include/uapi/linux/netfilter/x_tables.h +++ b/include/uapi/linux/netfilter/x_tables.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_X_TABLES_H #define _UAPI_X_TABLES_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #define XT_FUNCTION_MAXNAMELEN 30 diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index 776bc92e9118..3481cde43a84 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -2,7 +2,7 @@ #ifndef _UAPI__LINUX_NETLINK_H #define _UAPI__LINUX_NETLINK_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/socket.h> /* for __kernel_sa_family_t */ #include <linux/types.h> diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index d71013fffaf6..d3393a6571ba 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h @@ -23,7 +23,7 @@ #ifndef _UAPI_LINUX_SYSCTL_H #define _UAPI_LINUX_SYSCTL_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/compiler.h> -- 2.29.2

3 years, 4 months

1
0
0 0

[PATCH 1/1] uapi: move constants from <linux/kernel.h> to <linux/const.h>

by Petr Vorel

and include <linux/const.h> in UAPI headers instead of <linux/kernel.h>. commit a85cbe6159ffc973e5702f70a3bd5185f8f3c38d upstream. The reason is to avoid indirect <linux/sysinfo.h> include when using some network headers: <linux/netlink.h> or others -> <linux/kernel.h> -> <linux/sysinfo.h>. This indirect include causes on MUSL redefinition of struct sysinfo when included both <sys/sysinfo.h> and some of UAPI headers: In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, from ../include/tst_netlink.h:14, from tst_crypto.c:13: x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo' struct sysinfo { ^~~~~~~ In file included from ../include/tst_safe_macros.h:15, from ../include/tst_test.h:93, from tst_crypto.c:11: x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here Link: https://lkml.kernel.org/r/20201015190013.8901-1-petr.vorel@gmail.com Signed-off-by: Petr Vorel <petr.vorel(a)gmail.com> Suggested-by: Rich Felker <dalias(a)aerifal.cx> Acked-by: Rich Felker <dalias(a)libc.org> Cc: Peter Korsgaard <peter(a)korsgaard.com> Cc: Baruch Siach <baruch(a)tkos.co.il> Cc: Florian Weimer <fweimer(a)redhat.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- Hi, could this fix be backported to stable releases? Maybe safer to wait till v5.11 release. Adjusted for stable/linux-4.14.y. Kind regards, Petr include/uapi/linux/const.h | 5 +++++ include/uapi/linux/ethtool.h | 2 +- include/uapi/linux/kernel.h | 9 +-------- include/uapi/linux/lightnvm.h | 2 +- include/uapi/linux/mroute6.h | 2 +- include/uapi/linux/netfilter/x_tables.h | 2 +- include/uapi/linux/netlink.h | 2 +- include/uapi/linux/sysctl.h | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index 92537757590a..dab9f34383e5 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -25,4 +25,9 @@ #define _BITUL(x) (_AC(1,UL) << (x)) #define _BITULL(x) (_AC(1,ULL) << (x)) +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) + +#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + #endif /* !(_LINUX_CONST_H) */ diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 9eae13eefc49..1e3f1a43bf1d 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -14,7 +14,7 @@ #ifndef _UAPI_LINUX_ETHTOOL_H #define _UAPI_LINUX_ETHTOOL_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/if_ether.h> diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h index 0ff8f7477847..fadf2db71fe8 100644 --- a/include/uapi/linux/kernel.h +++ b/include/uapi/linux/kernel.h @@ -3,13 +3,6 @@ #define _UAPI_LINUX_KERNEL_H #include <linux/sysinfo.h> - -/* - * 'kernel.h' contains some often-used function prototypes etc - */ -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) -#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) - -#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#include <linux/const.h> #endif /* _UAPI_LINUX_KERNEL_H */ diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h index 42d1a434af29..0d44ebba0093 100644 --- a/include/uapi/linux/lightnvm.h +++ b/include/uapi/linux/lightnvm.h @@ -21,7 +21,7 @@ #define _UAPI_LINUX_LIGHTNVM_H #ifdef __KERNEL__ -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/ioctl.h> #else /* __KERNEL__ */ #include <stdio.h> diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h index 9999cc006390..1617eb9949a5 100644 --- a/include/uapi/linux/mroute6.h +++ b/include/uapi/linux/mroute6.h @@ -2,7 +2,7 @@ #ifndef _UAPI__LINUX_MROUTE6_H #define _UAPI__LINUX_MROUTE6_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/sockios.h> #include <linux/in6.h> /* For struct sockaddr_in6. */ diff --git a/include/uapi/linux/netfilter/x_tables.h b/include/uapi/linux/netfilter/x_tables.h index a8283f7dbc51..b8c6bb233ac1 100644 --- a/include/uapi/linux/netfilter/x_tables.h +++ b/include/uapi/linux/netfilter/x_tables.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_X_TABLES_H #define _UAPI_X_TABLES_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #define XT_FUNCTION_MAXNAMELEN 30 diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index 776bc92e9118..3481cde43a84 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -2,7 +2,7 @@ #ifndef _UAPI__LINUX_NETLINK_H #define _UAPI__LINUX_NETLINK_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/socket.h> /* for __kernel_sa_family_t */ #include <linux/types.h> diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index 0f272818a4d2..5fc0b7fd0847 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h @@ -23,7 +23,7 @@ #ifndef _UAPI_LINUX_SYSCTL_H #define _UAPI_LINUX_SYSCTL_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/compiler.h> -- 2.29.2

3 years, 4 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2021