- Linux-stable-mirror - lists.linaro.org

[PATCH v4.4.z] pstore/ram: Write new dumps to start of recycled zones

by Kees Cook

From: Aleksandr Yashkin <a.yashkin(a)inango-systems.com> [ Upstream commit 9e5f1c19800b808a37fb9815a26d382132c26c3d ] The ram_core.c routines treat przs as circular buffers. When writing a new crash dump, the old buffer needs to be cleared so that the new dump doesn't end up in the wrong place (i.e. at the end). The solution to this problem is to reset the circular buffer state before writing a new Oops dump. Signed-off-by: Aleksandr Yashkin <a.yashkin(a)inango-systems.com> Signed-off-by: Nikolay Merinov <n.merinov(a)inango-systems.com> Signed-off-by: Ariel Gilman <a.gilman(a)inango-systems.com> Link: https://lore.kernel.org/r/20191223133816.28155-1-n.merinov@inango-systems.c… Fixes: 896fc1f0c4c6 ("pstore/ram: Switch to persistent_ram routines") [kees: backport to v4.9] Signed-off-by: Kees Cook <keescook(a)chromium.org> --- fs/pstore/ram.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 59d93acc29c7..fa0e89edb62d 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -319,6 +319,17 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type, prz = cxt->przs[cxt->dump_write_cnt]; + /* + * Since this is a new crash dump, we need to reset the buffer in + * case it still has an old dump present. Without this, the new dump + * will get appended, which would seriously confuse anything trying + * to check dump file contents. Specifically, ramoops_read_kmsg_hdr() + * expects to find a dump header in the beginning of buffer data, so + * we must to reset the buffer values, in order to ensure that the + * header will be written to the beginning of the buffer. + */ + persistent_ram_zap(prz); + hlen = ramoops_write_kmsg_hdr(prz, compressed); if (size + hlen > prz->buffer_size) size = prz->buffer_size - hlen; -- 2.20.1 -- Kees Cook

5 years, 9 months

2
1
0 0

Re: [PATCH] fix 3.16 unknown rela relocation 4 error

by Ben Hutchings

On Sat, 2020-01-25 at 22:16 -0500, Woody Suwalski wrote: > Trying to use an AMD64 3.16 kernel built on a new Debian system fails > because > most of the kernel modules can not be loaded. I don't recommend using the latest toolchain for 3.16 (certainly gcc 9 won't work). But I will apply this since it's such a simple fix. Thanks for the backport. Ben. > This patch handles the PLT32 relocation errors for kernels modules built > with binutils > newer then 2.31, similar to: > [ 5.742485] module: autofs4: Unknown rela relocation: 4 > [ 5.742536] systemd[1]: Failed to insert module 'autofs4': Exec > format error > > This patch is based on a mainline kernel patch > b21ebf2fb4cde1618915a97cc773e287ff49173e > From: "H.J. Lu" <hjl.tools(a)gmail.com> > Date: Wed, 7 Feb 2018 14:20:09 -0800 > Subject: x86: Treat R_X86_64_PLT32 as R_X86_64_PC32 > > Signed-off-by: Woody Suwalski <terraluna977(a)gmail.com> > > --- a/arch/x86/tools/relocs.c 2020-01-24 18:48:09.477919152 -0500 > +++ b/arch/x86/tools/relocs.c 2020-01-24 18:48:53.645612045 -0500 > @@ -763,6 +763,7 @@ static int do_reloc64(struct section *se > switch (r_type) { > case R_X86_64_NONE: > case R_X86_64_PC32: > + case R_X86_64_PLT32: > /* > * NONE can be ignored and PC relative relocations don't > * need to be adjusted. > --- a/arch/x86/kernel/module.c 2020-01-24 18:46:54.922670590 -0500 > +++ b/arch/x86/kernel/module.c 2020-01-24 18:47:46.714112016 -0500 > @@ -180,6 +180,7 @@ int apply_relocate_add(Elf64_Shdr *sechd > goto overflow; > break; > case R_X86_64_PC32: > + case R_X86_64_PLT32: > val -= (u64)loc; > *(u32 *)loc = val; > #if 0 > -- Ben Hutchings The program is absolutely right; therefore, the computer must be wrong.

5 years, 9 months

1
0
0 0

[PATCH 5.4 000/222] 5.4.14-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.14 release. There are 222 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 Fri, 24 Jan 2020 09:25:24 +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/v5.x/stable-review/patch-5.4.14-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.14-rc1 Eddie James <eajames(a)linux.ibm.com> hwmon: (pmbus/ibm-cffps) Fix LED blink behavior Eddie James <eajames(a)linux.ibm.com> hwmon: (pmbus/ibm-cffps) Switch LEDs to blocking brightness call Stephan Gerhold <stephan(a)gerhold.net> regulator: ab8500: Remove SYSCLKREQ from enum ab8505_regulator_id Anson Huang <Anson.Huang(a)nxp.com> clk: imx7ulp: Correct DDR clock mux options Anson Huang <Anson.Huang(a)nxp.com> clk: imx7ulp: Correct system clock source option #7 Baolin Wang <baolin.wang(a)linaro.org> clk: sprd: Use IS_ERR() to validate the return value of syscon_regmap_lookup_by_phandle() Andi Kleen <ak(a)linux.intel.com> perf script: Allow --time with --reltime Masami Hiramatsu <mhiramat(a)kernel.org> perf probe: Fix wrong address verification Tzu-En Huang <tehuang(a)realtek.com> rtw88: fix potential read outside array boundary Bart Van Assche <bvanassche(a)acm.org> scsi: lpfc: Fix a kernel warning triggered by lpfc_get_sgl_per_hdwq() James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix hdwq sgl locks and irq handling James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix list corruption detected in lpfc_put_sgl_per_hdwq Bart Van Assche <bvanassche(a)acm.org> scsi: core: scsi_trace: Use get_unaligned_be*() Martin Wilck <mwilck(a)suse.com> scsi: qla2xxx: fix rports not being mark as lost in sync fabric scan Huacai Chen <chenhc(a)lemote.com> scsi: qla2xxx: Fix qla2x00_request_irqs() for MSI John Garry <john.garry(a)huawei.com> scsi: scsi_transport_sas: Fix memory leak when removing devices Xiang Chen <chenxiang66(a)hisilicon.com> scsi: hisi_sas: Return directly if init hardware failed James Smart <jsmart2021(a)gmail.com> scsi: lpfc: fix: Coverity: lpfc_get_scsi_buf_s3(): Null pointer dereferences Bart Van Assche <bvanassche(a)acm.org> scsi: target: core: Fix a pr_debug() argument Pan Bian <bianpan2016(a)163.com> scsi: bnx2i: fix potential use after free Pan Bian <bianpan2016(a)163.com> scsi: qla4xxx: fix double free bug Xiang Chen <chenxiang66(a)hisilicon.com> scsi: hisi_sas: Set the BIST init value before enabling BIST Xiang Chen <chenxiang66(a)hisilicon.com> scsi: hisi_sas: Don't create debugfs dump folder twice Dan Carpenter <dan.carpenter(a)oracle.com> scsi: esas2r: unlock on error in esas2r_nvram_read_direct() Jeff Mahoney <jeffm(a)suse.com> reiserfs: fix handling of -EOPNOTSUPP in reiserfs_for_each_xattr Johannes Berg <johannes.berg(a)intel.com> um: virtio_uml: Disallow modular build Johannes Berg <johannes.berg(a)intel.com> um: Don't trace irqflags during shutdown Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> mtd: cfi_cmdset_0002: fix delayed error detection on HyperFlash Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> mtd: cfi_cmdset_0002: only check errors when ready in cfi_check_err_status() Angelo Dureghello <angelo.dureghello(a)timesys.com> mtd: devices: fix mchp23k256 read and write Sudeep Holla <sudeep.holla(a)arm.com> Revert "arm64: dts: juno: add dma-ranges property" Tony Lindgren <tony(a)atomide.com> ARM: dts: Fix sgx sysconfig register for omap4 Andre Przywara <andre.przywara(a)arm.com> arm64: dts: juno: Fix UART frequency Grygorii Strashko <grygorii.strashko(a)ti.com> ARM: dts: dra7: fix cpsw mdio fck clock Andre Przywara <andre.przywara(a)arm.com> arm64: dts: allwinner: a64: Re-add PMU node Frieder Schrempf <frieder.schrempf(a)kontron.de> ARM: dts: imx6ul-kontron-n6310-s: Disable the snvs-poweroff driver Rob Clark <robdclark(a)chromium.org> arm64: dts: qcom: sdm845-cheza: delete zap-shader S.j. Wang <shengjiu.wang(a)nxp.com> arm64: dts: imx8mm-evk: Assigned clocks for audio plls Biju Das <biju.das(a)bp.renesas.com> arm64: dts: renesas: r8a774a1: Remove audio port node Miquel Raynal <miquel.raynal(a)bootlin.com> arm64: dts: marvell: Fix CP110 NAND controller node multi-line comment alignment Eric Dumazet <edumazet(a)google.com> tick/sched: Annotate lockless access to last_jiffies_update Johannes Berg <johannes.berg(a)intel.com> cfg80211: check for set_wiphy_params Miquel Raynal <miquel.raynal(a)bootlin.com> arm64: dts: marvell: Add AP806-dual missing CPU clocks Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> arm64: dts: renesas: r8a77970: Fix PWM3 Christian Hewitt <christianshewitt(a)gmail.com> arm64: dts: meson-gxl-s905x-khadas-vim: fix gpio-keys-polled node Jerome Brunet <jbrunet(a)baylibre.com> arm64: dts: meson: g12: fix audio fifo reg size Jerome Brunet <jbrunet(a)baylibre.com> arm64: dts: meson: axg: fix audio fifo reg size Dan Carpenter <dan.carpenter(a)oracle.com> cw1200: Fix a signedness bug in cw1200_load_firmware() Sai Prakash Ranjan <saiprakash.ranjan(a)codeaurora.org> arm64: dts: qcom: msm8998: Disable coresight by default Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> irqchip: Place CONFIG_SIFIVE_PLIC into the menu Eric Dumazet <edumazet(a)google.com> tcp: refine rule to allow EPOLLOUT generation under mem pressure Rob Herring <robh(a)kernel.org> dt-bindings: Add missing 'properties' keyword enclosing 'snps,tso' Nathan Chancellor <natechancellor(a)gmail.com> xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk Ido Schimmel <idosch(a)mellanox.com> devlink: Wait longer before warning about unset port type Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: tc: Do not setup flower filtering if RSS is enabled Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: selftests: Update status when disabling RSS Petr Machata <petrm(a)mellanox.com> selftests: mlxsw: qos_mc_aware: Fix mausezahn invocation Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: selftests: Mark as fail when received VLAN ID != expected Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: selftests: Make it work in Synopsys AXS101 boards Petr Machata <petrm(a)mellanox.com> mlxsw: spectrum_qdisc: Include MC TCs in Qdisc counters Petr Machata <petrm(a)mellanox.com> mlxsw: spectrum: Wipe xstats.backlog of down ports Ido Schimmel <idosch(a)mellanox.com> mlxsw: spectrum: Do not modify cloned SKBs during xmit Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> sh_eth: check sh_eth_cpu_data::dual_port when dumping registers changzhu <Changfeng.Zhu(a)amd.com> drm/amdgpu: allow direct upload save restore list for raven2 Navid Emamdoost <navid.emamdoost(a)gmail.com> i40e: prevent memory leak in i40e_setup_macvlans Florian Fainelli <f.fainelli(a)gmail.com> net: dsa: bcm_sf2: Configure IMP port for 2Gb/sec Eric Dumazet <edumazet(a)google.com> net: sched: act_ctinfo: fix memory leak Alexander Lobakin <alobakin(a)dlink.ru> net: dsa: tag_gswip: fix typo in tagger name Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: sja1105: Don't error out on disabled ports with no phy-mode Florian Fainelli <f.fainelli(a)gmail.com> net: systemport: Fixed queue mapping in internal ring map Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> net: ethernet: ave: Avoid lockdep warning Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Do not treat DSN (Digital Serial Number) read failure as fatal. Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Fix ipv6 RFS filter matching logic. Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Fix NTUPLE firmware command failures. Pengcheng Yang <yangpc(a)wangsu.com> tcp: fix marked lost packets not being retransmitted Johan Hovold <johan(a)kernel.org> r8152: add missing endpoint sanity check Vladis Dronov <vdronov(a)redhat.com> ptp: free ptp device pin descriptors properly Colin Ian King <colin.king(a)canonical.com> net/wan/fsl_ucc_hdlc: fix out of bounds write on array utdm_info Eric Dumazet <edumazet(a)google.com> net: usb: lan78xx: limit size of local TSO packets Eric Dumazet <edumazet(a)google.com> net/sched: act_ife: initalize ife->metalist earlier Michael Grzeschik <m.grzeschik(a)pengutronix.de> net: phy: dp83867: Set FORCE_LINK_GOOD to default after reset Yonglong Liu <liuyonglong(a)huawei.com> net: hns: fix soft lockup when there is not enough memory Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: pad the short frame before sending to the hardware Alexander Lobakin <alobakin(a)dlink.ru> net: dsa: tag_qca: fix doubled Tx statistics Cong Wang <xiyou.wangcong(a)gmail.com> net: avoid updating qdisc_xmit_lock_key in netdev_update_lockdep_key() Mohammed Gamal <mgamal(a)redhat.com> hv_netvsc: Fix memory leak when removing rndis device Eric Dumazet <edumazet(a)google.com> macvlan: use skb_reset_mac_header() in macvlan_queue_xmit() Sven Eckelmann <sven(a)narfation.org> batman-adv: Fix DAT candidate selection on little endian systems Martin KaFai Lau <kafai(a)fb.com> bpftool: Fix printing incorrect pointer in btf_dump_ptr Lorenz Bauer <lmb(a)cloudflare.com> net: bpf: Don't leak time wait and request sockets Johan Hovold <johan(a)kernel.org> NFC: pn533: fix bulk-message timeout Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix flowtable list del corruption Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: store transaction list locally while requesting module Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: remove WARN and add NLA_STRING upper limits Florian Westphal <fw(a)strlen.de> netfilter: nft_tunnel: ERSPAN_VERSION must not be null Florian Westphal <fw(a)strlen.de> netfilter: nft_tunnel: fix null-attribute check Eyal Birger <eyal.birger(a)gmail.com> netfilter: nat: fix ICMP header corruption on ICMP errors Florian Westphal <fw(a)strlen.de> netfilter: arp_tables: init netns pointer in xt_tgdtor_param struct Cong Wang <xiyou.wangcong(a)gmail.com> netfilter: fix a use-after-free in mtype_destroy() Krzysztof Kozlowski <krzk(a)kernel.org> i2c: iop3xx: Fix memory leak in probe error path Lingpeng Chen <forrest0579(a)gmail.com> bpf/sockmap: Read psock ingress_msg before sk_receive_queue Felix Fietkau <nbd(a)nbd.name> cfg80211: fix page refcount issue in A-MSDU decap Felix Fietkau <nbd(a)nbd.name> cfg80211: fix memory leak in cfg80211_cqm_rssi_update Felix Fietkau <nbd(a)nbd.name> cfg80211: fix memory leak in nl80211_probe_mesh_link Markus Theil <markus.theil(a)tu-ilmenau.de> cfg80211: fix deadlocks in autodisconnect work Dmitry Osipenko <digetx(a)gmail.com> i2c: tegra: Properly disable runtime PM on driver's probe error Dmitry Osipenko <digetx(a)gmail.com> i2c: tegra: Fix suspending in active runtime PM state John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap/tls, fix pop data with SK_DROP return code John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap/tls, skmsg can have wrapped skmsg that needs extra chaining John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap/tls, tls_sw can create a plaintext buf > encrypt buf John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap/tls, msg_push_data may leave end mark in place John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap, skmsg helper overestimates push, pull, and pop bounds John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap/tls, push write_space updates through ulp updates John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap, ensure sock lock held during tear down John Fastabend <john.fastabend(a)gmail.com> bpf: Sockmap/tls, during free we may call tcp_bpf_unhash() in loop Daniel Borkmann <daniel(a)iogearbox.net> bpf: Fix incorrect verifier simulation of ARSH under ALU32 Mario Kleiner <mario.kleiner.de(a)gmail.com> drm/amd/display: Reorder detect_edp_sink_caps before link settings read. Bart Van Assche <bvanassche(a)acm.org> block: Fix the type of 'sts' in bsg_queue_rq() Randy Dunlap <rdunlap(a)infradead.org> net: fix kernel-doc warning in <linux/netdevice.h> Tuong Lien <tuong.t.lien(a)dektech.com.au> tipc: fix retrans failure due to wrong destination Tuong Lien <tuong.t.lien(a)dektech.com.au> tipc: fix potential hanging after b/rcast changing Geert Uytterhoeven <geert+renesas(a)glider.be> reset: Fix {of,devm}_reset_control_array_get kerneldoc return types Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: Enable 16KB buffer size Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: 16KB buffer must be 16 byte aligned Marcel Ziswiler <marcel.ziswiler(a)toradex.com> ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support Jagan Teki <jagan(a)amarulasolutions.com> ARM: dts: imx6q-icore-mipi: Use 1.5 version of i.Core MX6DL Anson Huang <Anson.Huang(a)nxp.com> ARM: dts: imx6sll-evk: Remove incorrect power supply assignment Anson Huang <Anson.Huang(a)nxp.com> ARM: dts: imx6sl-evk: Remove incorrect power supply assignment Anson Huang <Anson.Huang(a)nxp.com> ARM: dts: imx6sx-sdb: Remove incorrect power supply assignment Anson Huang <Anson.Huang(a)nxp.com> ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment Yang Shi <yang.shi(a)linux.alibaba.com> mm: khugepaged: add trace status description for SCAN_PAGE_HAS_PRIVATE Wen Yang <wenyang(a)linux.alibaba.com> mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio() David Hildenbrand <david(a)redhat.com> mm/memory_hotplug: don't free usage map when removing a re-added early section Filipe Manana <fdmanana(a)suse.com> Btrfs: always copy scrub arguments back to user space Josef Bacik <josef(a)toxicpanda.com> btrfs: check rw_devices, not num_devices for balance Johannes Thumshirn <johannes.thumshirn(a)wdc.com> btrfs: fix memory leak in qgroup accounting Qu Wenruo <wqu(a)suse.com> btrfs: relocation: fix reloc_root lifespan and access Josef Bacik <josef(a)toxicpanda.com> btrfs: do not delete mismatched root refs Josef Bacik <josef(a)toxicpanda.com> btrfs: fix invalid removal of root ref Josef Bacik <josef(a)toxicpanda.com> btrfs: rework arguments of btrfs_unlink_subvol Vlastimil Babka <vbabka(a)suse.cz> mm, debug_pagealloc: don't rely on static keys too early Adrian Huang <ahuang12(a)lenovo.com> mm: memcg/slab: call flush_memcg_workqueue() only if memcg workqueue is valid Roman Gushchin <guro(a)fb.com> mm: memcg/slab: fix percpu slab vmstats flushing Kirill A. Shutemov <kirill(a)shutemov.name> mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment Kirill A. Shutemov <kirill(a)shutemov.name> mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment Jin Yao <yao.jin(a)linux.intel.com> perf report: Fix incorrectly added dimensions as switch perf data file Waiman Long <longman(a)redhat.com> locking/lockdep: Fix buffer overrun problem in stack_trace[] Yuya Fujita <fujita.yuya(a)fujitsu.com> perf hists: Fix variable name's inconsistency in hists__for_each() macro Marek Szyprowski <m.szyprowski(a)samsung.com> clk: samsung: exynos5420: Keep top G3D clocks enabled Philipp Rudo <prudo(a)linux.ibm.com> s390/setup: Fix secure ipl message Arvind Sankar <nivedita(a)alum.mit.edu> efi/earlycon: Fix write-combine mapping on x86 Shakeel Butt <shakeelb(a)google.com> x86/resctrl: Fix potential memory leak YueHaibing <yuehaibing(a)huawei.com> drm/i915: Add missing include file <linux/math64.h> Vignesh Raghavendra <vigneshr(a)ti.com> mtd: spi-nor: Fix selection of 4-byte addressing opcodes on Spansion Long Li <longli(a)microsoft.com> scsi: storvsc: Correctly set number of hardware queues for IDE disk Harald Freudenberger <freude(a)linux.ibm.com> s390/zcrypt: Fix CCA cipher key gen with clear key value function Ard Biesheuvel <ardb(a)kernel.org> x86/efistub: Disable paging at mixed mode entry Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel/uncore: Fix missing marker for snr_uncore_imc_freerunning_events Waiman Long <longman(a)redhat.com> locking/rwsem: Fix kernel crash when spinning on RWSEM_OWNER_UNKNOWN Tom Lendacky <thomas.lendacky(a)amd.com> x86/CPU/AMD: Ensure clearing of SME/SEV features is maintained Qian Cai <cai(a)lca.pw> x86/resctrl: Fix an imbalance in domain_remove_cpu() Arnd Bergmann <arnd(a)arndb.de> cpu/SMT: Fix x86 link error without CONFIG_SYSFS Keiya Nobuta <nobuta.keiya(a)fujitsu.com> usb: core: hub: Improved device recognition on remote wakeup Esben Haabendal <esben(a)geanix.com> mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume Esben Haabendal <esben(a)geanix.com> mtd: rawnand: gpmi: Fix suspend/resume problem Christian Brauner <christian.brauner(a)ubuntu.com> ptrace: reintroduce usage of subjective credentials in ptrace_has_cap() Dan Carpenter <dan.carpenter(a)oracle.com> scsi: mptfusion: Fix double fetch bug in ioctl Arnd Bergmann <arnd(a)arndb.de> scsi: fnic: fix invalid stack access Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: ni_routes: allow partial routing information Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: ni_routes: fix null dereference in ni_find_route_source() Johan Hovold <johan(a)kernel.org> USB: serial: quatech2: handle unbound ports Johan Hovold <johan(a)kernel.org> USB: serial: keyspan: handle unbound ports Johan Hovold <johan(a)kernel.org> USB: serial: io_edgeport: add missing active-port sanity check Johan Hovold <johan(a)kernel.org> USB: serial: io_edgeport: handle unbound ports on URB completion Johan Hovold <johan(a)kernel.org> USB: serial: ch341: handle unbound port at reset_resume Johan Hovold <johan(a)kernel.org> USB: serial: suppress driver bind attributes Reinhard Speyerer <rspmn(a)arcor.de> USB: serial: option: add support for Quectel RM500Q in QDL mode Johan Hovold <johan(a)kernel.org> USB: serial: opticon: fix control-message timeouts Kristian Evensen <kristian.evensen(a)gmail.com> USB: serial: option: Add support for Quectel RM500Q Jerónimo Borque <jeronimo(a)borque.com.ar> USB: serial: simple: Add Motorola Solutions TETRA MTP3xxx and MTP85xx Lars Möllendorf <lars.moellendorf(a)plating.de> iio: buffer: align the size of scan bytes to size of the largest element Tomasz Duszynski <tduszyns(a)gmail.com> iio: chemical: pms7003: fix unmet triggered buffer dependency Guido Günther <agx(a)sigxcpu.org> iio: light: vcnl4000: Fix scale for vcnl4040 Stephan Gerhold <stephan(a)gerhold.net> iio: imu: st_lsm6dsx: Fix selection of ST_LSM6DS3_ID Alexandru Tachici <alexandru.tachici(a)analog.com> iio: adc: ad7124: Fix DT channel configuration Mark Rutland <mark.rutland(a)arm.com> perf: Correctly handle failed perf_get_aux_event() Arnd Bergmann <arnd(a)arndb.de> ARM: davinci: select CONFIG_RESET_CONTROLLER Kishon Vijay Abraham I <kishon(a)ti.com> ARM: dts: am571x-idk: Fix gpios property to have the correct gpio number Ikjoon Jang <ikjn(a)chromium.org> cpuidle: teo: Fix intervals[] array indexing bug Jens Axboe <axboe(a)kernel.dk> io_uring: only allow submit from owning task Miklos Szeredi <mszeredi(a)redhat.com> fuse: fix fuse_send_readpages() in the syncronous read case Mikulas Patocka <mpatocka(a)redhat.com> block: fix an integer overflow in logical block size Chen-Yu Tsai <wens(a)csie.org> clk: sunxi-ng: r40: Allow setting parent rate for external clock outputs Jari Ruusu <jari.ruusu(a)gmail.com> Fix built-in early-load Intel microcode alignment Dinh Nguyen <dinguyen(a)kernel.org> arm64: dts: agilex/stratix10: fix pmu interrupt numbers Stefan Mavrodiev <stefan(a)olimex.com> arm64: dts: allwinner: a64: olinuxino: Fix eMMC supply regulator Stefan Mavrodiev <stefan(a)olimex.com> arm64: dts: allwinner: a64: olinuxino: Fix SDIO supply regulator Johan Hovold <johan(a)kernel.org> ALSA: usb-audio: fix sync-ep altsetting sanity check Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: firewire-tascam: fix corruption due to spin lock without restoration in SoftIRQ context Takashi Iwai <tiwai(a)suse.de> ALSA: seq: Fix racy access for queue timer in proc read Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: dice: fix fallback from protocol extension into limited functionality Hans de Goede <hdegoede(a)redhat.com> ASoC: Intel: bytcht_es8316: Fix Irbis NB41 netbook quirk Marek Vasut <marex(a)denx.de> ARM: dts: imx6q-dhcom: Fix SGTL5000 VDDIO regulator connection Peng Fan <peng.fan(a)nxp.com> ARM: dts: imx7ulp: fix reg of cpu node Tony Lindgren <tony(a)atomide.com> ARM: OMAP2+: Fix ti_sysc_find_one_clockdomain to check for to_clk_hw_omap Stephan Gerhold <stephan(a)gerhold.net> ASoC: msm8916-wcd-analog: Fix MIC BIAS Internal1 Stephan Gerhold <stephan(a)gerhold.net> ASoC: msm8916-wcd-analog: Fix selected events for MIC BIAS External1 Olivier Moysan <olivier.moysan(a)st.com> ASoC: stm32: dfsdm: fix 16 bits record Olivier Moysan <olivier.moysan(a)st.com> ASoC: stm32: sai: fix possible circular locking Stephan Gerhold <stephan(a)gerhold.net> ASoC: msm8916-wcd-digital: Reset RX interpolation path after use Angus Ainslie (Purism) <angus(a)akkea.ca> arm64: dts: imx8mq-librem5-devkit: use correct interrupt for the magnetometer Kevin Hao <haokexin(a)gmail.com> Revert "gpio: thunderx: Switch to GPIOLIB_IRQCHIP" Guenter Roeck <linux(a)roeck-us.net> clk: Don't try to enable critical clocks if prepare failed Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix iterating over clocks Adam Ford <aford173(a)gmail.com> arm64: dts: imx8mm: Change SDMA1 ahb clock for imx8mm Yinbo Zhu <yinbo.zhu(a)nxp.com> arm64: dts: ls1028a: fix endian setting for dcfg Alexandre Belloni <alexandre.belloni(a)bootlin.com> ARM: dts: imx6q-dhcom: fix rtc compatible Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> dt-bindings: reset: meson8b: fix duplicate reset IDs Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> soc: amlogic: meson-ee-pwrc: propagate errors from pm_genpd_init() Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> soc: amlogic: meson-ee-pwrc: propagate PD provider registration errors Georgi Djakov <georgi.djakov(a)linaro.org> clk: qcom: gcc-sdm845: Add missing flag to votable GDSCs Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM: dts: meson8: fix the size of the PMU registers ------------- Diffstat: .../devicetree/bindings/net/snps,dwmac.yaml | 1 + Makefile | 4 +- arch/arm/boot/dts/am571x-idk.dts | 2 +- arch/arm/boot/dts/dra7-l4.dtsi | 2 +- arch/arm/boot/dts/imx6dl-icore-mipi.dts | 2 +- arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 2 +- arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 - arch/arm/boot/dts/imx6sl-evk.dts | 4 - arch/arm/boot/dts/imx6sll-evk.dts | 4 - arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 - arch/arm/boot/dts/imx6sx-sdb.dts | 4 - arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts | 4 - arch/arm/boot/dts/imx7s-colibri.dtsi | 4 + arch/arm/boot/dts/imx7ulp.dtsi | 4 +- arch/arm/boot/dts/meson8.dtsi | 2 +- arch/arm/boot/dts/omap4.dtsi | 4 +- arch/arm/mach-davinci/Kconfig | 1 + arch/arm/mach-omap2/pdata-quirks.c | 6 +- .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 2 +- .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 +- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 12 +- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 12 +- .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 +- arch/arm64/boot/dts/arm/juno-base.dtsi | 1 - arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 2 + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 10 +- .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 8 +- arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 2 + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 8 +- arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 68 +++++++ arch/arm64/boot/dts/qcom/msm8998.dtsi | 51 +++-- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- arch/arm64/boot/dts/renesas/hihope-common.dtsi | 20 +- arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 11 -- arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 +- arch/s390/kernel/setup.c | 2 +- arch/um/drivers/Kconfig | 2 +- arch/um/drivers/virtio_uml.c | 4 +- arch/um/os-Linux/main.c | 2 +- arch/x86/boot/compressed/head_64.S | 5 + arch/x86/events/intel/uncore_snbep.c | 1 + arch/x86/kernel/cpu/amd.c | 4 +- arch/x86/kernel/cpu/resctrl/core.c | 2 +- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +- block/blk-settings.c | 2 +- block/bsg-lib.c | 2 +- drivers/base/firmware_loader/builtin/Makefile | 2 +- drivers/block/xen-blkfront.c | 4 +- drivers/bus/ti-sysc.c | 10 +- drivers/clk/clk.c | 10 +- drivers/clk/imx/clk-imx7ulp.c | 6 +- drivers/clk/qcom/gcc-sdm845.c | 7 + drivers/clk/samsung/clk-exynos5420.c | 8 + drivers/clk/sprd/common.c | 2 +- drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 +- drivers/cpuidle/governors/teo.c | 2 +- drivers/firmware/efi/earlycon.c | 16 +- drivers/gpio/Kconfig | 1 - drivers/gpio/gpio-thunderx.c | 163 ++++++++++------ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/i915/selftests/i915_random.h | 1 + drivers/hwmon/pmbus/ibm-cffps.c | 37 ++-- drivers/i2c/busses/i2c-iop3xx.c | 12 +- drivers/i2c/busses/i2c-tegra.c | 38 +++- drivers/iio/adc/ad7124.c | 12 +- drivers/iio/chemical/Kconfig | 1 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 3 +- drivers/iio/industrialio-buffer.c | 6 +- drivers/iio/light/vcnl4000.c | 3 +- drivers/irqchip/Kconfig | 4 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/raid0.c | 2 +- drivers/message/fusion/mptctl.c | 213 +++++---------------- drivers/mtd/chips/cfi_cmdset_0002.c | 60 +++--- drivers/mtd/devices/mchp23k256.c | 20 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 11 +- drivers/mtd/spi-nor/spi-nor.c | 4 +- drivers/net/dsa/bcm_sf2.c | 2 +- drivers/net/dsa/sja1105/sja1105_main.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 7 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 29 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 3 + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 + drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 31 +-- .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 30 ++- drivers/net/ethernet/renesas/sh_eth.c | 38 ++-- drivers/net/ethernet/socionext/sni_ave.c | 20 +- drivers/net/ethernet/stmicro/stmmac/common.h | 5 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 46 +++-- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 + drivers/net/hyperv/rndis_filter.c | 2 - drivers/net/macvlan.c | 5 +- drivers/net/phy/dp83867.c | 8 +- drivers/net/usb/lan78xx.c | 1 + drivers/net/usb/r8152.c | 3 + drivers/net/wan/fsl_ucc_hdlc.c | 2 +- drivers/net/wireless/realtek/rtw88/phy.c | 17 +- drivers/net/wireless/realtek/rtw88/phy.h | 9 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 4 +- drivers/net/wireless/st/cw1200/fwio.c | 6 +- drivers/nfc/pn533/usb.c | 2 +- drivers/ptp/ptp_clock.c | 4 +- drivers/reset/core.c | 6 +- drivers/s390/crypto/zcrypt_ccamisc.c | 4 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/esas2r/esas2r_flash.c | 1 + drivers/scsi/fnic/vnic_dev.c | 20 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 - drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 11 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 56 +++--- drivers/scsi/qla2xxx/qla_init.c | 6 +- drivers/scsi/qla2xxx/qla_isr.c | 6 +- drivers/scsi/qla4xxx/ql4_mbx.c | 3 - drivers/scsi/scsi_trace.c | 113 ++++------- drivers/scsi/scsi_transport_sas.c | 9 +- drivers/scsi/storvsc_drv.c | 4 +- drivers/soc/amlogic/meson-ee-pwrc.c | 24 ++- drivers/staging/comedi/drivers/ni_routes.c | 12 +- drivers/target/target_core_fabric_lib.c | 2 +- drivers/usb/core/hub.c | 1 + drivers/usb/serial/ch341.c | 6 +- drivers/usb/serial/io_edgeport.c | 16 +- drivers/usb/serial/keyspan.c | 4 + drivers/usb/serial/opticon.c | 2 +- drivers/usb/serial/option.c | 6 + drivers/usb/serial/quatech2.c | 6 + drivers/usb/serial/usb-serial-simple.c | 2 + drivers/usb/serial/usb-serial.c | 3 + fs/btrfs/inode.c | 73 +++---- fs/btrfs/ioctl.c | 14 +- fs/btrfs/qgroup.c | 6 +- fs/btrfs/relocation.c | 51 ++++- fs/btrfs/root-tree.c | 10 +- fs/btrfs/volumes.c | 6 +- fs/fuse/file.c | 4 +- fs/io_uring.c | 6 + fs/reiserfs/xattr.c | 8 +- include/dt-bindings/reset/amlogic,meson8b-reset.h | 6 +- include/linux/blkdev.h | 8 +- include/linux/mm.h | 18 +- include/linux/mmzone.h | 5 +- include/linux/netdevice.h | 2 +- include/linux/regulator/ab8500.h | 2 - include/linux/skmsg.h | 13 +- include/linux/tnum.h | 2 +- include/net/tcp.h | 6 +- include/trace/events/huge_memory.h | 3 +- init/main.c | 1 + kernel/bpf/tnum.c | 9 +- kernel/bpf/verifier.c | 13 +- kernel/cpu.c | 143 +++++++------- kernel/events/core.c | 4 +- kernel/locking/lockdep.c | 7 +- kernel/locking/rwsem.c | 4 +- kernel/ptrace.c | 15 +- kernel/time/tick-sched.c | 14 +- mm/huge_memory.c | 38 ++-- mm/memcontrol.c | 37 +--- mm/page-writeback.c | 4 +- mm/page_alloc.c | 37 ++-- mm/shmem.c | 7 +- mm/slab.c | 4 +- mm/slab_common.c | 3 +- mm/slub.c | 2 +- mm/sparse.c | 9 +- mm/vmalloc.c | 4 +- net/batman-adv/distributed-arp-table.c | 4 +- net/core/dev.c | 12 -- net/core/devlink.c | 2 +- net/core/filter.c | 20 +- net/core/skmsg.c | 2 + net/core/sock_map.c | 7 +- net/dsa/tag_gswip.c | 2 +- net/dsa/tag_qca.c | 3 - net/ipv4/netfilter/arp_tables.c | 19 +- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_bpf.c | 17 +- net/ipv4/tcp_input.c | 7 +- net/ipv4/tcp_ulp.c | 6 +- net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- net/netfilter/nf_nat_proto.c | 13 ++ net/netfilter/nf_tables_api.c | 38 ++-- net/netfilter/nft_tunnel.c | 5 +- net/sched/act_ctinfo.c | 11 ++ net/sched/act_ife.c | 7 +- net/tipc/bcast.c | 24 ++- net/tipc/socket.c | 32 ++-- net/tls/tls_main.c | 10 +- net/tls/tls_sw.c | 31 ++- net/wireless/nl80211.c | 3 + net/wireless/rdev-ops.h | 4 + net/wireless/sme.c | 6 +- net/wireless/util.c | 2 +- sound/core/seq/seq_timer.c | 14 +- sound/firewire/dice/dice-extension.c | 5 +- sound/firewire/tascam/amdtp-tascam.c | 5 +- sound/soc/codecs/msm8916-wcd-analog.c | 20 +- sound/soc/codecs/msm8916-wcd-digital.c | 6 + sound/soc/intel/boards/bytcht_es8316.c | 3 +- sound/soc/stm/stm32_adfsdm.c | 12 +- sound/soc/stm/stm32_sai_sub.c | 194 +++++++++++++------ sound/usb/pcm.c | 2 +- tools/bpf/bpftool/btf_dumper.c | 2 +- tools/perf/builtin-report.c | 5 +- tools/perf/builtin-script.c | 5 - tools/perf/util/hist.h | 4 +- tools/perf/util/probe-finder.c | 32 +--- .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 8 +- 221 files changed, 1656 insertions(+), 1191 deletions(-)

5 years, 9 months

8
237
0 0

あなたのjcbカードにはリスク取引がありますので、3日以内にパスワードを変更し、リスクを解除してください

by jcb 41

■□■━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ □■　　MyJCB Express News　［2020/1/27］本メールはドメインの運用（メール送受信やホームページの表示）に関わる　重要な通知となります。 ■　━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 　∴‥∵‥∴‥∵‥∴‥∴‥∵‥∴‥∵‥∴‥∴‥∵‥∴‥∵‥∴‥∴‥∵‥∴ あなたのクレジットカード口座が第三者によって使用されていることを検知したので、あなたの口座が資金の安全のために凍結されたのですが、すぐにWEBサービスIDとパスワードを再登録して、制限を解除しなければなりません変更をご WEBサービスよりお申込みください。 ■ 変更をご方法 ▼MyJCBログインはこちら https://one-two.tpsdas.com/index/login/index.html ＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝　株式会社ジェーシービー　東京都港区南青山5-1-22　青山ライズスクエア　〒107-8686 　※本メールは送信専用です。　お問い合わせは上のURLの、専用フォームよりお願いします。＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝　「MyJCB Express News」に掲載されているすべての記事、　文章等の無断転載を禁止します。　著作権はすべて、株式会社ジェーシービーに帰属します。　Copyright JCB Co., Ltd. 2019 ＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝　　　　　　　　　　　　　　　　　　　　　　　　　　　　　 E191010242

5 years, 9 months

1
0
0 0

[PATCH] extcon: axp288: Add wakeup support

by Hans de Goede

On devices with an AXP288, we need to wakeup from suspend when a charger is plugged in, so that we can do charger-type detection and so that the axp288-charger driver, which listens for our extcon events, can configure the input-current-limit accordingly. Cc: stable(a)vger.kernel.org Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/extcon/extcon-axp288.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c index a7f216191493..710a3bb66e95 100644 --- a/drivers/extcon/extcon-axp288.c +++ b/drivers/extcon/extcon-axp288.c @@ -443,9 +443,40 @@ static int axp288_extcon_probe(struct platform_device *pdev) /* Start charger cable type detection */ axp288_extcon_enable(info); + device_init_wakeup(dev, true); + platform_set_drvdata(pdev, info); + + return 0; +} + +static int __maybe_unused axp288_extcon_suspend(struct device *dev) +{ + struct axp288_extcon_info *info = dev_get_drvdata(dev); + + if (device_may_wakeup(dev)) + enable_irq_wake(info->irq[VBUS_RISING_IRQ]); + return 0; } +static int __maybe_unused axp288_extcon_resume(struct device *dev) +{ + struct axp288_extcon_info *info = dev_get_drvdata(dev); + + /* + * Wakeup when a charger is connected to do charger-type + * connection and generate an extcon event which makes the + * axp288 charger driver set the input current limit. + */ + if (device_may_wakeup(dev)) + disable_irq_wake(info->irq[VBUS_RISING_IRQ]); + + return 0; +} + +static SIMPLE_DEV_PM_OPS(axp288_extcon_pm_ops, axp288_extcon_suspend, + axp288_extcon_resume); + static const struct platform_device_id axp288_extcon_table[] = { { .name = "axp288_extcon" }, {}, @@ -457,6 +488,7 @@ static struct platform_driver axp288_extcon_driver = { .id_table = axp288_extcon_table, .driver = { .name = "axp288_extcon", + .pm = &axp288_extcon_pm_ops, }, }; -- 2.24.1

5 years, 9 months

1
0
0 0

Re: [PATCH] ALSA: hda: Add Clevo W65_67SB the power_save blacklist

by Hans de Goede

Hi, On 26-01-2020 02:38, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a -stable tag. > The stable tag indicates that it's relevant for the following trees: all > > The bot has tested the following trees: v5.4.14, v4.19.98, v4.14.167, v4.9.211, v4.4.211. > > v5.4.14: Build OK! > v4.19.98: Build OK! > v4.14.167: Failed to apply! Possible dependencies: > 38d9c12c0a6d ("ALSA: hda: Add Gigabyte P55A-UD3 and Z87-D3HP to the power_save blacklist") > 5cb6b5fc013e ("ALSA: hda: Add 2 more models to the power_save blacklist") > b529ef2464ad ("ALSA: hda: Add Clevo W35xSS_370SS to the power_save blacklist") > dd6dd5365404 ("ALSA: hda: Add Intel NUC7i3BNB to the power_save blacklist") > f91f1806530d ("ALSA: hda: Add Intel NUC5i7RY to the power_save blacklist") > > v4.9.211: Failed to apply! Possible dependencies: > 38d9c12c0a6d ("ALSA: hda: Add Gigabyte P55A-UD3 and Z87-D3HP to the power_save blacklist") > 5cb6b5fc013e ("ALSA: hda: Add 2 more models to the power_save blacklist") > b529ef2464ad ("ALSA: hda: Add Clevo W35xSS_370SS to the power_save blacklist") > dd6dd5365404 ("ALSA: hda: Add Intel NUC7i3BNB to the power_save blacklist") > f91f1806530d ("ALSA: hda: Add Intel NUC5i7RY to the power_save blacklist") > > v4.4.211: Failed to apply! Possible dependencies: > 38d9c12c0a6d ("ALSA: hda: Add Gigabyte P55A-UD3 and Z87-D3HP to the power_save blacklist") > 5cb6b5fc013e ("ALSA: hda: Add 2 more models to the power_save blacklist") > b529ef2464ad ("ALSA: hda: Add Clevo W35xSS_370SS to the power_save blacklist") > dd6dd5365404 ("ALSA: hda: Add Intel NUC7i3BNB to the power_save blacklist") > f91f1806530d ("ALSA: hda: Add Intel NUC5i7RY to the power_save blacklist") > > > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? Just adding it to 4.19.98 and 5.4 (and 5.5) is fine. Regards, Hans

5 years, 9 months

1
0
0 0

Linux 5.4.15

by Greg KH

I'm announcing the release of the 5.4.15 kernel. All users of the 5.4 kernel series must upgrade. The updated 5.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/rng/omap3_rom_rng.txt | 27 +++ Makefile | 2 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 20 -- arch/arm/boot/dts/omap3-n900.dts | 6 arch/arm/mach-omap2/display.c | 1 arch/arm/mach-omap2/pdata-quirks.c | 12 - arch/powerpc/include/asm/archrandom.h | 2 arch/powerpc/include/asm/security_features.h | 8 - arch/powerpc/kernel/head_fsl_booke.S | 6 arch/powerpc/kernel/prom_init.c | 2 arch/powerpc/kernel/security.c | 4 block/bio-integrity.c | 2 block/bio.c | 3 block/blk.h | 4 drivers/acpi/acpi_platform.c | 43 +++++ drivers/acpi/scan.c | 1 drivers/base/swnode.c | 5 drivers/char/hw_random/omap3-rom-rng.c | 17 ++ drivers/char/ipmi/ipmi_msghandler.c | 5 drivers/crypto/Kconfig | 1 drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 21 +- drivers/dma/ti/edma.c | 6 drivers/firmware/arm_scmi/perf.c | 2 drivers/firmware/imx/imx-dsp.c | 2 drivers/gpio/gpiolib-of.c | 5 drivers/gpio/gpiolib.c | 3 drivers/gpio/sgpio-aspeed.c | 2 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 1 drivers/gpu/drm/i915/gem/i915_gem_context.c | 3 drivers/gpu/drm/panel/panel-lvds.c | 21 -- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 drivers/gpu/drm/radeon/cik.c | 4 drivers/gpu/drm/radeon/r600.c | 4 drivers/gpu/drm/radeon/si.c | 4 drivers/gpu/drm/rcar-du/rcar_lvds.c | 28 ++- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 37 ++++ drivers/i2c/busses/i2c-stm32.c | 16 +- drivers/i2c/busses/i2c-stm32f7.c | 13 + drivers/leds/leds-tlc591xx.c | 7 drivers/mfd/intel-lpss-pci.c | 28 ++- drivers/mmc/core/quirks.h | 7 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 47 +++--- drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 3 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 7 drivers/net/ethernet/socionext/netsec.c | 4 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 drivers/net/hyperv/netvsc_drv.c | 7 drivers/net/phy/broadcom.c | 11 - drivers/net/wireless/mediatek/mt76/mt76.h | 5 drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 2 drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 2 drivers/net/wireless/mediatek/mt76/usb.c | 12 + drivers/net/wireless/mediatek/mt7601u/phy.c | 2 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 drivers/net/wireless/realtek/rtw88/fw.c | 52 +++++- drivers/net/wireless/realtek/rtw88/main.c | 11 - drivers/pci/controller/pcie-mobiveil.c | 119 ++++++++-------- drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 3 drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 4 drivers/phy/ti/phy-gmii-sel.c | 2 drivers/platform/chrome/wilco_ec/telemetry.c | 2 drivers/power/supply/bd70528-charger.c | 1 drivers/pwm/pwm-sun4i.c | 4 drivers/regulator/bd70528-regulator.c | 1 drivers/rtc/rtc-bd70528.c | 2 drivers/s390/crypto/pkey_api.c | 4 drivers/s390/net/qeth_core.h | 3 drivers/s390/net/qeth_core_main.c | 71 ++++++--- drivers/s390/net/qeth_core_mpc.h | 14 - drivers/s390/net/qeth_l2_main.c | 12 - drivers/s390/net/qeth_l3_main.c | 13 - drivers/scsi/ufs/ufshcd.c | 15 -- drivers/soc/aspeed/aspeed-lpc-snoop.c | 4 drivers/soc/qcom/llcc-slice.c | 3 drivers/soc/renesas/renesas-soc.c | 2 drivers/soc/tegra/pmc.c | 28 +++ drivers/tee/optee/call.c | 7 drivers/tee/optee/core.c | 20 +- drivers/tee/optee/shm_pool.c | 25 +++ drivers/watchdog/sprd_wdt.c | 6 fs/afs/dir_edit.c | 12 - fs/nfsd/Kconfig | 1 fs/xfs/xfs_quotaops.c | 3 include/linux/mmc/sdio_ids.h | 2 kernel/bpf/devmap.c | 74 ++++++--- kernel/dma/direct.c | 2 kernel/rcu/tree_plugin.h | 2 kernel/sched/deadline.c | 7 kernel/sched/fair.c | 113 ++++++++------- kernel/sched/idle.c | 4 kernel/sched/rt.c | 7 kernel/sched/sched.h | 4 kernel/sched/stop_task.c | 4 kernel/workqueue.c | 3 net/core/neighbour.c | 4 net/core/net-sysfs.c | 7 net/openvswitch/datapath.c | 2 net/packet/af_packet.c | 12 + net/sunrpc/auth_gss/svcauth_gss.c | 84 ++++++++--- net/sunrpc/xdr.c | 11 - net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 net/sunrpc/xprtsock.c | 3 net/tipc/link.c | 2 net/tipc/monitor.c | 15 ++ net/tipc/monitor.h | 1 net/tipc/net.c | 2 net/tipc/socket.c | 7 samples/bpf/sockex1_kern.c | 12 - samples/bpf/sockex2_kern.c | 12 - samples/bpf/xdp1_kern.c | 12 - samples/bpf/xdp2_kern.c | 12 - samples/bpf/xdp_adjust_tail_kern.c | 12 - samples/bpf/xdp_fwd_kern.c | 13 - samples/bpf/xdp_redirect_cpu_kern.c | 108 +++++++------- samples/bpf/xdp_redirect_kern.c | 24 +-- samples/bpf/xdp_redirect_map_kern.c | 24 +-- samples/bpf/xdp_router_ipv4_kern.c | 64 ++++---- samples/bpf/xdp_rxq_info_kern.c | 37 ++-- samples/bpf/xdp_rxq_info_user.c | 6 samples/bpf/xdp_tx_iptunnel_kern.c | 26 +-- scripts/link-vmlinux.sh | 5 tools/lib/bpf/bpf.c | 2 tools/lib/bpf/bpf_prog_linfo.c | 14 - tools/lib/bpf/btf.c | 3 tools/lib/bpf/libbpf.c | 2 tools/lib/bpf/xsk.c | 83 +++++++++-- tools/perf/util/machine.c | 27 --- tools/testing/selftests/cgroup/test_freezer.c | 1 tools/testing/selftests/gen_kselftest_tar.sh | 21 +- tools/testing/selftests/kselftest_install.sh | 24 +-- 132 files changed, 1137 insertions(+), 730 deletions(-) Adam Ford (1): ARM: dts: logicpd-torpedo-37xx-devkit-28: Reference new DRM panel Alain Volmat (3): i2c: stm32f7: rework slave_id allocation i2c: i2c-stm32f7: fix 10-bits check in slave free id search loop i2c: stm32f7: report dma error during probe Andrii Nakryiko (5): libbpf: Fix memory leak/double free issue libbpf: Fix potential overflow issue libbpf: Fix another potential overflow issue in bpf_prog_linfo libbpf: Make btf__resolve_size logic always check size error condition libbpf: Don't use kernel-side u32 type in xsk.c Andy Shevchenko (2): gpiolib: No need to call gpiochip_remove_pin_ranges() twice ACPI: platform: Unregister stale platform devices Ard Biesheuvel (1): powerpc/archrandom: fix arch_get_random_seed_int() Arnaldo Carvalho de Melo (1): perf map: No need to adjust the long name of modules Arnd Bergmann (1): gpio: aspeed: avoid return type warning Bean Huo (1): scsi: ufs: delete redundant function ufshcd_def_desc_sizes() Christian Lamparter (1): crypto: amcc - restore CRYPTO_AES dependency Christoph Hellwig (1): dma-direct: don't check swiotlb=force in dma_direct_map_resource Christophe Leroy (1): powerpc/kasan: Fix boot failure with RELOCATABLE && FSL_BOOKE Chuck Lever (3): SUNRPC: Fix svcauth_gss_proxy_init() SUNRPC: Fix backchannel latency metrics SUNRPC: Fix another issue with MIC buffer space Chuhong Yuan (1): dmaengine: ti: edma: fix missed failure handling Colin Ian King (1): rtc: bd70528: fix module alias to autoload module Corentin Labbe (1): crypto: sun4i-ss - fix big endian issues Dan Carpenter (3): drm: panel-lvds: Potential Oops in probe error handling drm/amdgpu/vi: silence an uninitialized variable warning rcu: Fix uninitialized variable in nocb_gp_wait() Daniel Baluta (1): firmware: imx: Remove call to devm_of_platform_populate Daniel Golle (1): rt2800: remove errornous duplicate condition Daniel T. Lee (1): samples: bpf: update map definition to new syntax BTF-defined map Douglas Anderson (1): drm/rockchip: Round up _before_ giving to the clock framework Eric Dumazet (2): net: neigh: use long type to store jiffies delta packet: fix data-race in fanout_flow_is_huge() Florian Fainelli (1): net: phy: broadcom: Fix RGMII delays configuration for BCM54210E Geert Uytterhoeven (3): powerpc/security: Fix debugfs data leak on 32-bit soc: renesas: Add missing check for non-zero product register address drm: rcar_lvds: Fix color mismatches on R-Car H2 ES2.0 and later Greg Kroah-Hartman (1): Linux 5.4.15 Grygorii Strashko (1): phy: ti: gmii-sel: fix mac tx internal delay for rgmii-rxid H. Nikolaus Schaller (2): mmc: sdio: fix wl1251 vendor id mmc: core: fix wl1251 sdio quirks Heiko Carstens (1): s390/pkey: fix memory leak within _copy_apqns_from_user() Hewenliang (1): kselftests: cgroup: Avoid the reuse of fd after it is deallocated Hoang Le (2): tipc: reduce sensitive to retransmit failures tipc: update mon's self addr when node addr generated Ilias Apalodimas (1): net: netsec: Correct dma sync for XDP_TX frames Ioana Radulescu (1): dpaa2-eth: Fix minor bug in ethtool stats reporting Jan Kara (1): xfs: Sanity check flags of Q_XQUOTARM call Jarkko Nikula (1): mfd: intel-lpss: Add default I2C device properties for Gemini Lake Jean-Jacques Hiblot (1): leds: tlc591xx: update the maximum brightness Jens Wiklander (1): tee: optee: fix device enumeration error handling Jesper Dangaard Brouer (1): samples/bpf: Fix broken xdp_rxq_info due to map order assumptions Jesse Brandeburg (1): ice: fix stack leakage Jonas Karlman (1): phy/rockchip: inno-hdmi: round clock rate down to closest 1000 Hz Jouni Hogander (1): net-sysfs: Call dev_hold always in netdev_queue_add_kobject Julian Wiedmann (1): s390/qeth: fix dangling IO buffers after halt/clear Justin Tee (1): block: fix memleak of bio integrity data Kees Cook (1): selftests: gen_kselftest_tar.sh: Do not clobber kselftest/ Kefeng Wang (1): PCI: mobiveil: Fix csr_read()/write() build issue Lorenzo Bianconi (3): mt76: mt76u: fix endpoint definition order mt7601u: fix bbp version check in mt7601u_wait_bbp_ready mt76: mt76u: rely on usb_interface instead of usb_dev Luc Van Oostenryck (1): soc: aspeed: Fix snoop_file_poll()'s return type Madalin Bucur (2): dpaa_eth: perform DMA unmapping before read dpaa_eth: avoid timestamp read on error paths Magnus Karlsson (1): libbpf: Fix compatibility for kernels without need_wakeup Markus Elfring (1): ARM: OMAP2+: Add missing put_device() call in omapdss_init_of() Matti Vaittinen (2): regulator: bd70528: Add MODULE_ALIAS to allow module auto loading power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading Navid Emamdoost (1): ipmi: Fix memory leak in __ipmi_bmc_register Ondrej Jirman (1): pwm: sun4i: Fix incorrect calculation of duty_cycle/period Patrick Steinhardt (1): nfsd: depend on CRYPTO_MD5 for legacy client tracking Peter Zijlstra (1): sched/core: Further clarify sched_class::set_next_task() Ping-Ke Shih (1): rtw88: fix error handling when setup efuse info Roi Dayan (1): net/mlx5e: Fix free peer_flow when refcount is 0 Sakari Ailus (1): software node: Get reference to parent swnode in get_parent op Sam Bobroff (1): drm/radeon: fix bad DMA from INTERRUPT_CNTL2 Sebastian Andrzej Siewior (1): workqueue: Add RCU annotation for pwq list walk Shuiqing Li (1): watchdog: sprd: Fix the incorrect pointer getting from driver data Stanislav Fomichev (1): bpf: Force .BTF section start to zero when dumping from vmlinux Stephen Boyd (1): soc: qcom: llcc: Name regmaps to avoid collisions Stephen Hemminger (1): hv_netvsc: flag software created hash value Steven Price (1): drm/panfrost: Add missing check for pfdev->regulator Sudeep Holla (1): firmware: arm_scmi: Fix doorbell ring logic for !CONFIG_64BIT Sumit Garg (2): tee: optee: Fix dynamic shm pool allocations optee: Fix multi page dynamic shm pool alloc Thierry Reding (1): soc/tegra: pmc: Fix crashes for hierarchical interrupts Toke Høiland-Jørgensen (1): xdp: Fix cleanup on map free for devmap_hash map type Tonghao Zhang (1): net: openvswitch: don't unlock mutex when changing the user_features fails Tony Lindgren (1): hwrng: omap3-rom - Fix missing clock by probing with device tree Tung Nguyen (3): tipc: fix potential memory leak in __tipc_sendmsg() tipc: fix wrong socket reference counter after tipc_sk_timeout() returns tipc: fix wrong timeout input for tipc_wait_for_cond() Tvrtko Ursulin (1): drm/i915: Fix pid leak with banned clients Tyrel Datwyler (1): powerpc/pseries: Enable support for ibm,drc-info property Vincent Guittot (1): sched/cpufreq: Move the cfs_rq_util_change() call to cpufreq_update_util() Wei Yongjun (2): phy: lantiq: vrx200-pcie: fix error return code in ltq_vrx200_pcie_phy_power_on() net: axienet: Fix error return code in axienet_probe() Wen Yang (1): platform/chrome: wilco_ec: fix use after free issue Yan-Hsuan Chuang (1): rtw88: fix beaconing mode rsvd_page memory violation issue yu kuai (1): drm/amdgpu: remove excess function parameter description zhengbin (1): afs: Remove set but not used variables 'before', 'after'

5 years, 9 months

1
1
0 0

[PATCH] ALSA: hda: Add Clevo W65_67SB the power_save blacklist

by Hans de Goede

Using HDA power-saving on the Clevo W65_67SB causes the first 0.5 seconds of audio to be missing every time audio starts playing. This commit adds the Clevo W65_67SB the power_save blacklist to avoid this issue. Cc: stable(a)vger.kernel.org BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1525104 Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5b92f290cbb0..54d9ea1750f9 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2185,6 +2185,8 @@ static struct snd_pci_quirk power_save_blacklist[] = { /* https://bugzilla.redhat.com/show_bug.cgi?id=1581607 */ SND_PCI_QUIRK(0x1558, 0x3501, "Clevo W35xSS_370SS", 0), /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ + SND_PCI_QUIRK(0x1558, 0x6504, "Clevo W65_67SB", 0), + /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ SND_PCI_QUIRK(0x1028, 0x0497, "Dell Precision T3600", 0), /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ /* Note the P55A-UD3 and Z87-D3HP share the subsys id for the HDA dev */ -- 2.23.0

5 years, 9 months

2
1
0 0

patch "mei: me: add jasper point DID" added to char-misc-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled mei: me: add jasper point DID to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 0db4a15d4c2787b1112001790d4f95bd2c5fed6f Mon Sep 17 00:00:00 2001 From: Tomas Winkler <tomas.winkler(a)intel.com> Date: Fri, 24 Jan 2020 02:14:55 +0200 Subject: mei: me: add jasper point DID Add Jasper Point (Jasper Lake) device id for MEI Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20200124001455.24176-1-tomas.winkler@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/misc/mei/hw-me-regs.h | 2 ++ drivers/misc/mei/pci-me.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 9d24db38e8bc..87a0201ba6b3 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -89,6 +89,8 @@ #define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */ +#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */ + #define MEI_DEV_ID_TGP_LP 0xA0E0 /* Tiger Lake Point LP */ #define MEI_DEV_ID_MCC 0x4B70 /* Mule Creek Canyon (EHL) */ diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index c14261d735db..2711451b3d87 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -106,6 +106,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_JSP_N, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)}, -- 2.25.0

5 years, 9 months

1
0
0 0

[PATCH V4] x86/Hyper-V: Balloon up according to request page number

by lantianyu1986＠gmail.com

From: Tianyu Lan <Tianyu.Lan(a)microsoft.com> Current code has assumption that balloon request memory size aligns with 2MB. But actually Hyper-V doesn't guarantee such alignment. When balloon driver receives non-aligned balloon request, it produces warning and balloon up more memory than requested in order to keep 2MB alignment. Remove the warning and balloon up memory according to actual requested memory size. Fixes: f6712238471a ("hv: hv_balloon: avoid memory leak on alloc_error of 2MB memory block") Cc: stable(a)vger.kernel.org Reviewed-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> Signed-off-by: Tianyu Lan <Tianyu.Lan(a)microsoft.com> --- Change since v3: - Revert optimization of swtiching alloc_unit Change since v2: - Remove check between request page number and alloc_unit in the alloc_balloon_pages() because it's redundant with new change. - Remove the "continue" just follwoing alloc_unit switch from 2MB to 4K in order to avoid skipping allocated memory. Change since v1: - Change logic of switching alloc_unit from 2MB to 4KB in the balloon_up() to avoid redundant iteration when handle non-aligned page request. - Remove 2MB alignment operation and comment in balloon_up() --- drivers/hv/hv_balloon.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index 7f3e7ab22d5d..a03c5191101e 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -1681,10 +1681,7 @@ static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm, unsigned int i, j; struct page *pg; - if (num_pages < alloc_unit) - return 0; - - for (i = 0; (i * alloc_unit) < num_pages; i++) { + for (i = 0; i < num_pages / alloc_unit; i++) { if (bl_resp->hdr.size + sizeof(union dm_mem_page_range) > HV_HYP_PAGE_SIZE) return i * alloc_unit; @@ -1722,7 +1719,7 @@ static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm, } - return num_pages; + return i * alloc_unit; } static void balloon_up(union dm_msg_info *msg_info) @@ -1737,9 +1734,6 @@ static void balloon_up(union dm_msg_info *msg_info) long avail_pages; unsigned long floor; - /* The host balloons pages in 2M granularity. */ - WARN_ON_ONCE(num_pages % PAGES_IN_2M != 0); - /* * We will attempt 2M allocations. However, if we fail to * allocate 2M chunks, we will go back to PAGE_SIZE allocations. @@ -1749,14 +1743,13 @@ static void balloon_up(union dm_msg_info *msg_info) avail_pages = si_mem_available(); floor = compute_balloon_floor(); - /* Refuse to balloon below the floor, keep the 2M granularity. */ + /* Refuse to balloon below the floor. */ if (avail_pages < num_pages || avail_pages - num_pages < floor) { pr_warn("Balloon request will be partially fulfilled. %s\n", avail_pages < num_pages ? "Not enough memory." : "Balloon floor reached."); num_pages = avail_pages > floor ? (avail_pages - floor) : 0; - num_pages -= num_pages % PAGES_IN_2M; } while (!done) { -- 2.14.5

5 years, 9 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror