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

答复: Re: [tip:x86/urgent] x86/mce: Ensure offline CPUs don' t participate in rendezvous process

by Tony W Wang-oc

On Thu, May 30, 2019, Tony W Wang-oc wrote: > Hi Ashok, > I have two questions about this patch, could you help to check: > > 1, for broadcast #MC exceptions, this patch seems require #MC exception > errors > set MCG_STATUS_RIPV = 1. > But for Intel CPU, some #MC exception errors set MCG_STATUS_RIPV = 0 > (like "Recoverable-not-continuable SRAR Type" Errors), for these errors > the patch doesn't seem to work, is that okay? > > 2, for LMCE exceptions, this patch seems require #MC exception errors > set MCG_STATUS_RIPV = 0 to make sure LMCE be handled normally even > on offline CPU. > For LMCE errors set MCG_STAUS_RIPV = 1, the patch prevents offline CPU > handle these LMCE errors, is that okay? > More specifically, this patch seems require #MC exceptions meet the condition "MCG_STATUS_RIPV ^ MCG_STATUS_LMCES == 1"; But on a Xeon X5650 machine (SMP), "Data CACHE Level-2 Generic Error" does not meet this condition. I got below message from: https://www.centos.org/forums/viewtopic.php?p=292742 Hardware event. This is not a software error. MCE 0 CPU 4 BANK 6 TSC b7065eeaa18b0 TIME 1545643603 Mon Dec 24 10:26:43 2018 MCG status:MCIP MCi status: Uncorrected error Error enabled Processor context corrupt MCA: Data CACHE Level-2 Generic Error STATUS b200000080000106 MCGSTATUS 4 MCGCAP 1c09 APICID 4 SOCKETID 0 CPUID Vendor Intel Family 6 Model 44 > Thanks > Tony W Wang-oc

6 years

3
3
0 0

[PATCH] Subject:alignment:fetch pc-instr before irq_enable

by xiaoqian

When the instruction code under PC address is read through _probe_kernel_read in do_alignment,if the pte page corresponding to the code segment of PC address is reclaimed exactly at this time, the address mapping cannot be reconstructed because page fault_disable() is executed in _probe_kernel_read function,and the failure to obtain the instruction code of PC finally results in the unsuccessful repair operation. Thus we can modify the implementation of reading user-mode PC instruction before local_irq_enable to avoid the above risk. At the same time, adjust the sequence of code processing and optimize the process. Signed-off-by: xiaoqian <xiaoqian9(a)huawei.com> Cc: stable(a)vger.kernel.org --- arch/arm/mm/alignment.c | 81 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 26 deletions(-) diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index e376883ab35b..4124b9ce3c70 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -76,6 +76,11 @@ #define IS_T32(hi16) \ (((hi16) & 0xe000) == 0xe000 && ((hi16) & 0x1800)) +#define INVALID_INSTR_MODE 0 +#define ARM_INSTR_MODE 1 +#define THUMB_INSTR_MODE 2 +#define THUMB2_INSTR_MODE 3 + static unsigned long ai_user; static unsigned long ai_sys; static void *ai_sys_last_pc; @@ -705,6 +710,48 @@ thumb2arm(u16 tinstr) } } +static unsigned int +fetch_usr_pc_instr(struct pt_regs *regs, unsigned long *pc_instrptr) +{ + unsigned int fault; + unsigned long instrptr; + unsigned long instr_mode = INVALID_INSTR_MODE; + + instrptr = instruction_pointer(regs); + + if (thumb_mode(regs)) { + u16 tinstr = 0; + u16 *ptr = (u16 *)(instrptr & ~1); + + fault = probe_kernel_address(ptr, tinstr); + if (!fault) { + tinstr = __mem_to_opcode_thumb16(tinstr); + if (cpu_architecture() >= CPU_ARCH_ARMv7 && + IS_T32(tinstr)) { + /* Thumb-2 32-bit */ + u16 tinstr2 = 0; + + fault = probe_kernel_address(ptr + 1, tinstr2); + if (!fault) { + tinstr2 = __mem_to_opcode_thumb16(tinstr2); + *pc_instrptr = __opcode_thumb32_compose(tinstr, tinstr2); + instr_mode = THUMB2_INSTR_MODE; + } + } else { + *pc_instrptr = thumb2arm(tinstr); + instr_mode = THUMB_INSTR_MODE; + } + } + } else { + fault = probe_kernel_address((void *)instrptr, *pc_instrptr); + if (!fault) { + *pc_instrptr = __mem_to_opcode_arm(*pc_instrptr); + instr_mode = ARM_INSTR_MODE; + } + } + return instr_mode; +} + /* * Convert Thumb-2 32 bit LDM, STM, LDRD, STRD to equivalent instruction * handlable by ARM alignment handler, also find the corresponding handler, @@ -775,42 +822,24 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) unsigned long instr = 0, instrptr; int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs); unsigned int type; - unsigned int fault; u16 tinstr = 0; int isize = 4; int thumb2_32b = 0; + unsigned long pc_instr_mode; + + pc_instr_mode = fetch_usr_pc_instr(regs, &instr); if (interrupts_enabled(regs)) local_irq_enable(); instrptr = instruction_pointer(regs); - - if (thumb_mode(regs)) { - u16 *ptr = (u16 *)(instrptr & ~1); - fault = probe_kernel_address(ptr, tinstr); - tinstr = __mem_to_opcode_thumb16(tinstr); - if (!fault) { - if (cpu_architecture() >= CPU_ARCH_ARMv7 && - IS_T32(tinstr)) { - /* Thumb-2 32-bit */ - u16 tinst2 = 0; - fault = probe_kernel_address(ptr + 1, tinst2); - tinst2 = __mem_to_opcode_thumb16(tinst2); - instr = __opcode_thumb32_compose(tinstr, tinst2); - thumb2_32b = 1; - } else { - isize = 2; - instr = thumb2arm(tinstr); - } - } - } else { - fault = probe_kernel_address((void *)instrptr, instr); - instr = __mem_to_opcode_arm(instr); - } - - if (fault) { + if (pc_instr_mode == INVALID_INSTR_MODE) { type = TYPE_FAULT; goto bad_or_fault; + } else if (pc_instr_mode == THUMB_INSTR_MODE) { + isize = 2; + } else if (pc_instr_mode == THUMB2_INSTR_MODE) { + thumb2_32b = 1; } if (user_mode(regs)) -- 2.12.3

6 years

1
0
0 0

[stable] bpf: add bpf_jit_limit knob to restrict unpriv allocations

by Ben Hutchings

Please consider backporting this commit to 4.19-stable: commit ede95a63b5e84ddeea6b0c473b36ab8bfd8c6ce3 Author: Daniel Borkmann <daniel(a)iogearbox.net> Date: Tue Oct 23 01:11:04 2018 +0200 bpf: add bpf_jit_limit knob to restrict unpriv allocations No other stable branches are affected by the issue. Ben. -- Ben Hutchings, Software Developer Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom

6 years

2
4
0 0

[PATCH 4.9 000/128] 4.9.180-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.180 release. There are 128 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 Sat 01 Jun 2019 03:02:06 AM UTC. 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.9.180-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.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.9.180-rc1 Chris Wilson <chris(a)chris-wilson.co.uk> drm: Wake up next in drm_read() chain if we are forced to putback the event Arnd Bergmann <arnd(a)arndb.de> ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM Chris Lesiak <chris.lesiak(a)licor.com> spi: Fix zero length xfer bug Geert Uytterhoeven <geert+renesas(a)glider.be> spi: rspi: Fix sequencer reset during initialization Aditya Pakki <pakki001(a)umn.edu> spi : spi-topcliff-pch: Fix to handle empty DMA buffers James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices Arnd Bergmann <arnd(a)arndb.de> media: saa7146: avoid high stack usage with clang James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix FDMI manufacturer attribute value Arnd Bergmann <arnd(a)arndb.de> media: go7007: avoid clang frame overflow warning with KASAN James Hutchinson <jahutchinson99(a)googlemail.com> media: m88ds3103: serialize reset messages in m88ds3103_set_frontend Sameer Pujar <spujar(a)nvidia.com> dmaengine: tegra210-adma: use devm_clk_*() helpers Arnd Bergmann <arnd(a)arndb.de> scsi: qla4xxx: avoid freeing unallocated dma memory Tony Lindgren <tony(a)atomide.com> usb: core: Add PM runtime calls to usb_hcd_platform_shutdown Paul E. McKenney <paulmck(a)linux.ibm.com> rcuperf: Fix cleanup path for invalid perf_type strings Paul E. McKenney <paulmck(a)linux.ibm.com> rcutorture: Fix cleanup path for invalid torture_type strings Tony Luck <tony.luck(a)intel.com> x86/mce: Fix machine_check_poll() tests for error types Kangjie Lu <kjlu(a)umn.edu> tty: ipwireless: fix missing checks for ioremap Pankaj Gupta <pagupta(a)redhat.com> virtio_console: initialize vtermno value for ports Dan Carpenter <dan.carpenter(a)oracle.com> media: wl128x: prevent two potential buffer overflows Sowjanya Komatineni <skomatineni(a)nvidia.com> spi: tegra114: reset controller on probe Gustavo A. R. Silva <gustavo(a)embeddedor.com> cxgb3/l2t: Fix undefined behaviour Wen Yang <wen.yang99(a)zte.com.cn> ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put Wen Yang <wen.yang99(a)zte.com.cn> ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put Nicolas Saenz Julienne <nsaenzjulienne(a)suse.de> HID: core: move Usage Page concatenation to Main item Chengguang Xu <cgxu519(a)gmx.com> chardev: add additional check for minor range overlap Peter Zijlstra <peterz(a)infradead.org> x86/ia32: Fix ia32_restore_sigcontext() AC leak Peter Zijlstra <peterz(a)infradead.org> x86/uaccess, signal: Fix AC=1 bloat Wen Yang <wen.yang99(a)zte.com.cn> arm64: cpu_ops: fix a leaked reference by adding missing of_node_put Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: Avoid configuring regulator with undefined voltage range Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: Fix regulator load and icc-level configuration Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: fix Oops when bringing up interface during USB disconnect Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: fix race during disconnect when USB completion is in progress Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: convert dev_init_lock mutex to completion Arnd Bergmann <arnd(a)arndb.de> b43: shut up clang -Wuninitialized variable warning Kangjie Lu <kjlu(a)umn.edu> brcmfmac: fix missing checks for kmemdup YueHaibing <yuehaibing(a)huawei.com> mwifiex: Fix mem leak in mwifiex_tm_cmd Kangjie Lu <kjlu(a)umn.edu> rtlwifi: fix a potential NULL pointer dereference Nathan Chancellor <natechancellor(a)gmail.com> iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data Kangjie Lu <kjlu(a)umn.edu> iio: hmc5843: fix potential NULL pointer dereferences Lars-Peter Clausen <lars(a)metafoo.de> iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion Kees Cook <keescook(a)chromium.org> x86/build: Keep local relocations with ld.lld Wen Yang <wen.yang99(a)zte.com.cn> cpufreq: pmac32: fix possible object reference leak Wen Yang <wen.yang99(a)zte.com.cn> cpufreq/pasemi: fix possible object reference leak Wen Yang <wen.yang99(a)zte.com.cn> cpufreq: ppc_cbe: fix possible object reference leak Arnd Bergmann <arnd(a)arndb.de> s390: cio: fix cio_irb declaration Charles Keepax <ckeepax(a)opensource.cirrus.com> extcon: arizona: Disable mic detect if running when driver is removed Ulf Hansson <ulf.hansson(a)linaro.org> PM / core: Propagate dev->power.wakeup_path when no callbacks Yinbo Zhu <yinbo.zhu(a)nxp.com> mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support Yinbo Zhu <yinbo.zhu(a)nxp.com> mmc: sdhci-of-esdhc: add erratum eSDHC5 support Kangjie Lu <kjlu(a)umn.edu> mmc_spi: add a status check for spi_sync_locked Andrea Merello <andrea.merello(a)gmail.com> mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers John Garry <john.garry(a)huawei.com> scsi: libsas: Do discovery on empty PHY to update PHY info Guenter Roeck <linux(a)roeck-us.net> hwmon: (f71805f) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (pc87427) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (smsc47b397) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (vt1211) Use request_muxed_region for Super-IO accesses Colin Ian King <colin.king(a)canonical.com> RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure Vincenzo Frascino <vincenzo.frascino(a)arm.com> arm64: vdso: Fix clock_getres() for CLOCK_REALTIME Nicholas Nunley <nicholas.d.nunley(a)intel.com> i40e: don't allow changes to HW VLAN stripping on active port VLANs Thomas Gleixner <tglx(a)linutronix.de> x86/irq/64: Limit IST stack overflow check to #DB stack Alan Stern <stern(a)rowland.harvard.edu> USB: core: Don't unbind interfaces following device reset failure Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> sched/core: Handle overflow in cpu_shares_write_u64 Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> sched/core: Check quota and period overflow at usec to nsec conversion Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/numa: improve control of topology updates Dan Carpenter <dan.carpenter(a)oracle.com> media: pvrusb2: Prevent a buffer overflow Shuah Khan <shuah(a)kernel.org> media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable() Wenwen Wang <wang6495(a)umn.edu> audit: fix a memory leak bug Akinobu Mita <akinobu.mita(a)gmail.com> media: ov2659: make S_FMT succeed even if requested format doesn't match Hans Verkuil <hverkuil(a)xs4all.nl> media: au0828: stop video streaming only when last user stops Janusz Krzysztofik <jmkrzyszt(a)gmail.com> media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper Philipp Zabel <p.zabel(a)pengutronix.de> media: coda: clear error return value before picture run Nicolas Ferre <nicolas.ferre(a)microchip.com> dmaengine: at_xdmac: remove BUG_ON macro in tasklet Wen Yang <wen.yang99(a)zte.com.cn> pinctrl: pistachio: fix leaked of_node references Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: use RAP instead of FAP to get the protocol version Peter Zijlstra <peterz(a)infradead.org> mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions Jiri Kosina <jkosina(a)suse.cz> x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> smpboot: Place the __percpu annotation correctly Kees Cook <keescook(a)chromium.org> x86/build: Move _etext to actual end of .text Arnd Bergmann <arnd(a)arndb.de> bcache: avoid clang -Wunintialized warning Coly Li <colyli(a)suse.de> bcache: add failure check to run_cache_set() for journal replay Tang Junhui <tang.junhui.linux(a)gmail.com> bcache: fix failure in journal relplay Coly Li <colyli(a)suse.de> bcache: return error immediately in bch_journal_replay() Corentin Labbe <clabbe.montjoie(a)gmail.com> crypto: sun4i-ss - Fix invalid calculation of hash end Kangjie Lu <kjlu(a)umn.edu> net: cw1200: fix a NULL pointer dereference Dan Carpenter <dan.carpenter(a)oracle.com> mwifiex: prevent an array overflow Daniel Baluta <daniel.baluta(a)nxp.com> ASoC: fsl_sai: Update is_slave_mode with correct value Sergey Matyukevich <sergey.matyukevich.os(a)quantenna.com> mac80211/cfg80211: update bss channel on channel switch Sugar Zhang <sugar.zhang(a)rock-chips.com> dmaengine: pl330: _stop: clear interrupt status Mariusz Bialonczyk <manio(a)skyboo.net> w1: fix the resume command API Sven Van Asbroeck <thesven73(a)gmail.com> rtc: 88pm860x: prevent use-after-free on device remove Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: don't crash on invalid RX interrupt Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Fix a qla24xx_enable_msix() error path Viresh Kumar <viresh.kumar(a)linaro.org> sched/cpufreq: Fix kobject memleak Qian Cai <cai(a)lca.pw> arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable Marc Zyngier <marc.zyngier(a)arm.com> ARM: vdso: Remove dependency with the arch_timer driver internals Dan Carpenter <dan.carpenter(a)oracle.com> brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler() Flavio Suligoi <f.suligoi(a)asem.it> spi: pxa2xx: fix SCR (divisor) calculation Arnd Bergmann <arnd(a)arndb.de> ASoC: imx: fix fiq dependencies Bo YU <tsu.yubo(a)gmail.com> powerpc/boot: Fix missing check of lseek() return value Jerome Brunet <jbrunet(a)baylibre.com> ASoC: hdmi-codec: unlock the device on startup errors Sameeh Jubran <sameehj(a)amazon.com> net: ena: gcc 8: fix compilation warning Sameer Pujar <spujar(a)nvidia.com> dmaengine: tegra210-dma: free dma controller in remove() Raul E Rangel <rrangel(a)chromium.org> mmc: core: Verify SD bus width YueHaibing <yuehaibing(a)huawei.com> cxgb4: Fix error path in cxgb4_init_module Ross Lagerwall <ross.lagerwall(a)citrix.com> gfs2: Fix lru_count going negative David Sterba <dsterba(a)suse.com> Revert "btrfs: Honour FITRIM range constraints during free space trim" Arnaldo Carvalho de Melo <acme(a)redhat.com> tools include: Adopt linux/bits.h Arnaldo Carvalho de Melo <acme(a)redhat.com> perf tools: No need to include bitops.h in util.h YueHaibing <yuehaibing(a)huawei.com> at76c50x-usb: Don't register led_trigger if usb_register_driver failed YueHaibing <yuehaibing(a)huawei.com> ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit Alexander Potapenko <glider(a)google.com> media: vivid: use vfree() instead of kfree() for dev->bitmap_cap YueHaibing <yuehaibing(a)huawei.com> media: cpia2: Fix use-after-free in cpia2_exit Jiufei Xue <jiufei.xue(a)linux.alibaba.com> fbdev: fix WARNING in __alloc_pages_nodemask bug Mike Kravetz <mike.kravetz(a)oracle.com> hugetlb: use same fault hash key for shared and private mappings Shile Zhang <shile.zhang(a)linux.alibaba.com> fbdev: fix divide error in fb_var_to_videomode Tobin C. Harding <tobin(a)kernel.org> btrfs: sysfs: don't leak memory when failing add fsid Filipe Manana <fdmanana(a)suse.com> Btrfs: fix race between ranged fsync and writeback of adjacent ranges Filipe Manana <fdmanana(a)suse.com> Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Fix sign extension bug in gfs2_update_stats Jean-Philippe Brucker <jean-philippe.brucker(a)arm.com> arm64: Save and restore OSDLR_EL1 across suspend/resume Dan Williams <dan.j.williams(a)intel.com> libnvdimm/namespace: Fix label tracking error Suthikulpanit, Suravee <Suravee.Suthikulpanit(a)amd.com> kvm: svm/avic: fix off-by-one in checking host APIC ID Daniel Axtens <dja(a)axtens.net> crypto: vmx - CTR: always increment IV as quadword Martin K. Petersen <martin.petersen(a)oracle.com> Revert "scsi: sd: Keep disk read-only when re-reading partition" Andrea Parri <andrea.parri(a)amarulasolutions.com> bio: fix improper use of smp_mb__before_atomic() Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: fix return value for reserved EFER Jan Kara <jack(a)suse.cz> ext4: do not delete unlinked inode from orphan list on failed truncate ------------- Diffstat: Makefile | 4 +- arch/arm/include/asm/cp15.h | 2 + arch/arm/vdso/vgettimeofday.c | 5 ++- arch/arm64/include/asm/pgtable.h | 3 +- arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cpu_ops.c | 1 + arch/arm64/kernel/vdso.c | 3 ++ arch/arm64/kernel/vdso/gettimeofday.S | 7 ++-- arch/arm64/mm/proc.S | 26 +++++++------ arch/powerpc/boot/addnote.c | 6 ++- arch/powerpc/mm/numa.c | 18 ++++++--- arch/x86/Makefile | 2 +- arch/x86/ia32/ia32_signal.c | 29 ++++++++------ arch/x86/kernel/cpu/mcheck/mce.c | 44 ++++++++++++++++++---- arch/x86/kernel/irq_64.c | 19 +++++++--- arch/x86/kernel/signal.c | 29 ++++++++------ arch/x86/kernel/vmlinux.lds.S | 6 +-- arch/x86/kvm/svm.c | 6 ++- arch/x86/kvm/x86.c | 2 +- arch/x86/mm/fault.c | 2 - drivers/base/power/main.c | 4 ++ drivers/char/virtio_console.c | 3 +- drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_governor.c | 2 + drivers/cpufreq/pasemi-cpufreq.c | 1 + drivers/cpufreq/pmac32-cpufreq.c | 2 + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 ++- drivers/crypto/vmx/aesp8-ppc.pl | 2 +- drivers/dma/at_xdmac.c | 6 ++- drivers/dma/pl330.c | 10 +++-- drivers/dma/tegra210-adma.c | 28 +++++++------- drivers/extcon/extcon-arizona.c | 10 +++++ drivers/gpu/drm/drm_fops.c | 1 + drivers/hid/hid-core.c | 36 ++++++++++++------ drivers/hid/hid-logitech-hidpp.c | 17 +++++++-- drivers/hwmon/f71805f.c | 15 ++++++-- drivers/hwmon/pc87427.c | 14 ++++++- drivers/hwmon/smsc47b397.c | 13 ++++++- drivers/hwmon/smsc47m1.c | 28 +++++++++----- drivers/hwmon/vt1211.c | 15 ++++++-- drivers/iio/adc/ad_sigma_delta.c | 16 +++++--- drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- drivers/iio/magnetometer/hmc5843_i2c.c | 7 +++- drivers/iio/magnetometer/hmc5843_spi.c | 7 +++- drivers/infiniband/hw/cxgb4/cm.c | 2 + drivers/md/bcache/alloc.c | 5 ++- drivers/md/bcache/journal.c | 26 +++++++++++-- drivers/md/bcache/super.c | 17 ++++++--- drivers/media/dvb-frontends/m88ds3103.c | 9 ++--- drivers/media/i2c/ov2659.c | 6 ++- drivers/media/i2c/soc_camera/ov6650.c | 25 ++++++------ drivers/media/pci/saa7146/hexium_gemini.c | 5 +-- drivers/media/pci/saa7146/hexium_orion.c | 5 +-- drivers/media/platform/coda/coda-bit.c | 3 ++ drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- drivers/media/radio/wl128x/fmdrv_common.c | 7 +++- drivers/media/usb/au0828/au0828-video.c | 16 +++++--- drivers/media/usb/cpia2/cpia2_v4l.c | 3 +- drivers/media/usb/go7007/go7007-fw.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + drivers/mmc/core/pwrseq_emmc.c | 38 ++++++++++--------- drivers/mmc/core/sd.c | 8 ++++ drivers/mmc/host/mmc_spi.c | 4 ++ drivers/mmc/host/sdhci-of-esdhc.c | 5 +++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 ++++++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++ drivers/net/wireless/atmel/at76c50x-usb.c | 4 +- drivers/net/wireless/broadcom/b43/phy_lp.c | 6 +-- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 10 +++-- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 27 +++++++------ .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 5 ++- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 +++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++- drivers/net/wireless/marvell/mwifiex/cfp.c | 3 ++ drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++ drivers/net/wireless/st/cw1200/main.c | 5 +++ drivers/nvdimm/label.c | 29 +++++++------- drivers/nvdimm/namespace_devs.c | 15 ++++++++ drivers/nvdimm/nd.h | 4 ++ drivers/pinctrl/pinctrl-pistachio.c | 2 + drivers/rtc/rtc-88pm860x.c | 2 +- drivers/s390/cio/cio.h | 2 +- drivers/scsi/libsas/sas_expander.c | 5 +++ drivers/scsi/lpfc/lpfc_ct.c | 3 ++ drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +++++- drivers/scsi/qla2xxx/qla_isr.c | 6 ++- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/sd.c | 3 +- drivers/scsi/ufs/ufshcd.c | 28 ++++++++++---- drivers/spi/spi-pxa2xx.c | 8 +++- drivers/spi/spi-rspi.c | 9 +++-- drivers/spi/spi-tegra114.c | 32 +++++++++------- drivers/spi/spi-topcliff-pch.c | 15 +++++++- drivers/spi/spi.c | 2 + drivers/ssb/bridge_pcmcia_80211.c | 9 ++++- drivers/tty/ipwireless/main.c | 8 ++++ drivers/usb/core/hcd.c | 3 ++ drivers/usb/core/hub.c | 5 ++- drivers/video/fbdev/core/fbcmap.c | 2 + drivers/video/fbdev/core/modedb.c | 3 ++ drivers/w1/w1_io.c | 3 +- fs/btrfs/extent-tree.c | 25 +++--------- fs/btrfs/file.c | 12 ++++++ fs/btrfs/root-tree.c | 4 +- fs/btrfs/sysfs.c | 7 +++- fs/char_dev.c | 6 +++ fs/ext4/inode.c | 2 +- fs/gfs2/glock.c | 22 ++++++----- fs/gfs2/lock_dlm.c | 9 +++-- fs/hugetlbfs/inode.c | 8 +--- include/linux/bio.h | 2 +- include/linux/hid.h | 1 + include/linux/hugetlb.h | 4 +- include/linux/iio/adc/ad_sigma_delta.h | 1 + include/linux/smpboot.h | 2 +- kernel/auditfilter.c | 12 +++--- kernel/rcu/rcuperf.c | 5 +++ kernel/rcu/rcutorture.c | 5 +++ kernel/sched/core.c | 9 ++++- lib/strncpy_from_user.c | 5 ++- lib/strnlen_user.c | 4 +- mm/hugetlb.c | 19 +++------- net/mac80211/mlme.c | 3 -- net/wireless/nl80211.c | 5 +++ sound/soc/codecs/hdmi-codec.c | 6 ++- sound/soc/davinci/davinci-mcasp.c | 2 + sound/soc/fsl/Kconfig | 9 +++-- sound/soc/fsl/eukrea-tlv320.c | 4 +- sound/soc/fsl/fsl_sai.c | 2 + sound/soc/fsl/fsl_utils.c | 1 + tools/include/linux/bitops.h | 7 +--- tools/include/linux/bits.h | 26 +++++++++++++ tools/perf/check-headers.sh | 1 + tools/perf/util/util.h | 1 - 140 files changed, 836 insertions(+), 371 deletions(-)

6 years

6
133
0 0

[PATCH v2] PCI: qcom: Ensure that PERST is asserted for at least 100 ms

by Niklas Cassel

Currently, there is only a 1 ms sleep after asserting PERST. Reading the datasheets for different endpoints, some require PERST to be asserted for 10 ms in order for the endpoint to perform a reset, others require it to be asserted for 50 ms. Several SoCs using this driver uses PCIe Mini Card, where we don't know what endpoint will be plugged in. The PCI Express Card Electromechanical Specification specifies: "On power up, the deassertion of PERST# is delayed 100 ms (TPVPERL) from the power rails achieving specified operating limits." Add a sleep of 100 ms before deasserting PERST, in order to ensure that we are compliant with the spec. Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Niklas Cassel <niklas.cassel(a)linaro.org> Acked-by: Stanimir Varbanov <svarbanov(a)mm-sol.com> Cc: stable(a)vger.kernel.org # 4.5+ --- Changes since v1: Move the sleep into qcom_ep_reset_deassert() drivers/pci/controller/dwc/pcie-qcom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 0ed235d560e3..5d1713069d14 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -178,6 +178,8 @@ static void qcom_ep_reset_assert(struct qcom_pcie *pcie) static void qcom_ep_reset_deassert(struct qcom_pcie *pcie) { + /* Ensure that PERST has been asserted for at least 100 ms */ + msleep(100); gpiod_set_value_cansleep(pcie->reset, 0); usleep_range(PERST_DELAY_US, PERST_DELAY_US + 500); } -- 2.21.0

6 years

3
3
0 0

❎ FAIL: Test report for kernel 4.19.47-rc1-011862f.cki (stable)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Commit: 9c8c1a222a6b - Linux 4.19.47-rc1 The results of these automated tests are provided below. Overall result: FAILED (see details below) Merge: OK Compile: OK Tests: FAILED One or more kernel tests failed: aarch64: ❎ Boot test We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-9c8c… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-9c8c… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-9c8c… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-9c8c… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-9c8c1a22… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-9c8c1a22… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-9c8c1a… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-9c8c1a… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ❎ Boot test [0] Host 2: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] ppc64le: Host 1: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ AMTU (Abstract Machine Test Utility) [6] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ Usex - version 1.9-29 [14] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [16] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking route: pmtu [19] 🚧 ✅ Networking route_func: local [20] 🚧 ✅ Networking route_func: forward [20] 🚧 ✅ Networking TCP: keepalive test [21] 🚧 ✅ Networking UDP: socket [22] 🚧 ✅ Networking tunnel: vxlan basic [23] 🚧 ✅ Networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] Host 2: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] s390x: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [2] Host 2: ✅ Boot test [0] ✅ kdump: sysrq-c [27] Host 3: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [16] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking: igmp conformance test [28] 🚧 ✅ Networking route: pmtu [19] 🚧 ✅ Networking route_func: local [20] 🚧 ✅ Networking route_func: forward [20] 🚧 ✅ Networking TCP: keepalive test [21] 🚧 ✅ Networking UDP: socket [22] 🚧 ✅ Networking tunnel: vxlan basic [23] 🚧 ✅ Networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns transport [25] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] x86_64: Host 1: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ AMTU (Abstract Machine Test Utility) [6] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ Usex - version 1.9-29 [14] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [16] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking: igmp conformance test [28] 🚧 ✅ Networking route: pmtu [19] 🚧 ✅ Networking route_func: local [20] 🚧 ✅ Networking route_func: forward [20] 🚧 ✅ Networking TCP: keepalive test [21] 🚧 ✅ Networking UDP: socket [22] 🚧 ✅ Networking tunnel: vxlan basic [23] 🚧 ✅ Networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns transport [25] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] Host 2: ✅ Boot test [0] ✅ kdump: sysrq-c [27] Host 3: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] Host 4: ✅ Boot test [0] ✅ kdump: sysrq-c - megaraid_sas [27] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/lvm/… [16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… [17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/s… [19]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [20]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [21]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/t… [22]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/u… [23]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [24]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [25]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [26]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/blk [27]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/kdump/kdump… [28]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/i… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

6 years

3
2
0 0

[PATCH v5 1/3] powerpc: Fix vDSO clock_getres()

by Vincenzo Frascino

clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res(). In particular, posix_get_hrtimer_res() does: sec = 0; ns = hrtimer_resolution; and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time. Fix the powerpc vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly. Fixes: a7f290dad32e ("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel") Cc: stable(a)vger.kernel.org Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Signed-off-by: Vincenzo Frascino <vincenzo.frascino(a)arm.com> Reviewed-by: Christophe Leroy <christophe.leroy(a)c-s.fr> --- Note: This patch is independent from the others in this series, hence it can be merged singularly by the powerpc maintainers. arch/powerpc/include/asm/vdso_datapage.h | 2 ++ arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h index bbc06bd72b1f..4333b9a473dc 100644 --- a/arch/powerpc/include/asm/vdso_datapage.h +++ b/arch/powerpc/include/asm/vdso_datapage.h @@ -86,6 +86,7 @@ struct vdso_data { __s32 wtom_clock_nsec; /* Wall to monotonic clock nsec */ __s64 wtom_clock_sec; /* Wall to monotonic clock sec */ struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ + __u32 hrtimer_res; /* hrtimer resolution */ __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */ __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ }; @@ -107,6 +108,7 @@ struct vdso_data { __s32 wtom_clock_nsec; struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ __u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */ + __u32 hrtimer_res; /* hrtimer resolution */ __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ __u32 dcache_block_size; /* L1 d-cache block size */ __u32 icache_block_size; /* L1 i-cache block size */ diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 8e02444e9d3d..dfc40f29f2b9 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -389,6 +389,7 @@ int main(void) OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec); OFFSET(STAMP_XTIME, vdso_data, stamp_xtime); OFFSET(STAMP_SEC_FRAC, vdso_data, stamp_sec_fraction); + OFFSET(CLOCK_REALTIME_RES, vdso_data, hrtimer_res); OFFSET(CFG_ICACHE_BLOCKSZ, vdso_data, icache_block_size); OFFSET(CFG_DCACHE_BLOCKSZ, vdso_data, dcache_block_size); OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size); @@ -419,7 +420,6 @@ int main(void) DEFINE(CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE); DEFINE(CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE); DEFINE(NSEC_PER_SEC, NSEC_PER_SEC); - DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC); #ifdef CONFIG_BUG DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 325d60633dfa..4ea4e9d7a58e 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -963,6 +963,7 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->wtom_clock_nsec = tk->wall_to_monotonic.tv_nsec; vdso_data->stamp_xtime = xt; vdso_data->stamp_sec_fraction = frac_sec; + vdso_data->hrtimer_res = hrtimer_resolution; smp_wmb(); ++(vdso_data->tb_update_count); } diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index afd516b572f8..2b5f9e83c610 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) cror cr0*4+eq,cr0*4+eq,cr1*4+eq bne cr0,99f + mflr r12 + .cfi_register lr,r12 + bl __get_datapage@local + lwz r5,CLOCK_REALTIME_RES(r3) + mtlr r12 li r3,0 cmpli cr0,r4,0 crclr cr0*4+so beqlr - lis r5,CLOCK_REALTIME_RES@h - ori r5,r5,CLOCK_REALTIME_RES@l stw r3,TSPC32_TV_SEC(r4) stw r5,TSPC32_TV_NSEC(r4) blr diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index 1f324c28705b..f07730f73d5e 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -190,12 +190,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) cror cr0*4+eq,cr0*4+eq,cr1*4+eq bne cr0,99f + mflr r12 + .cfi_register lr,r12 + bl V_LOCAL_FUNC(__get_datapage) + lwz r5,CLOCK_REALTIME_RES(r3) + mtlr r12 li r3,0 cmpldi cr0,r4,0 crclr cr0*4+so beqlr - lis r5,CLOCK_REALTIME_RES@h - ori r5,r5,CLOCK_REALTIME_RES@l std r3,TSPC64_TV_SEC(r4) std r5,TSPC64_TV_NSEC(r4) blr -- 2.21.0

6 years

2
1
0 0

[PATCH] Subject:ARM:fetch pc-instr before local_irq_enable

by xiaoqian

When the instruction code under PC address is read through _probe_kernel_read in do_alignment,if the pte page corresponding to the code segment of PC address is reclaimed exactly at this time, the address mapping cannot be reconstructed because page fault_disable() is executed in _probe_kernel_read function,and the failure to obtain the instruction code of PC finally results in the unsuccessful repair operation. Thus we can modify the implementation of reading user-mode PC instruction before local_irq_enable to avoid the above risk. At the same time, adjust the sequence of code processing and optimize the process. Signed-off-by: xiaoqian <xiaoqian9(a)huawei.com> Cc: stable(a)vger.kernel.org --- arch/arm/mm/alignment.c | 81 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 26 deletions(-) diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index e376883ab35b..4124b9ce3c70 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -76,6 +76,11 @@ #define IS_T32(hi16) \ (((hi16) & 0xe000) == 0xe000 && ((hi16) & 0x1800)) +#define INVALID_INSTR_MODE 0 +#define ARM_INSTR_MODE 1 +#define THUMB_INSTR_MODE 2 +#define THUMB2_INSTR_MODE 3 + static unsigned long ai_user; static unsigned long ai_sys; static void *ai_sys_last_pc; @@ -705,6 +710,48 @@ thumb2arm(u16 tinstr) } } +static unsigned int +fetch_usr_pc_instr(struct pt_regs *regs, unsigned long *pc_instrptr) +{ + unsigned int fault; + unsigned long instrptr; + unsigned long instr_mode = INVALID_INSTR_MODE; + + instrptr = instruction_pointer(regs); + + if (thumb_mode(regs)) { + u16 tinstr = 0; + u16 *ptr = (u16 *)(instrptr & ~1); + + fault = probe_kernel_address(ptr, tinstr); + if (!fault) { + tinstr = __mem_to_opcode_thumb16(tinstr); + if (cpu_architecture() >= CPU_ARCH_ARMv7 && + IS_T32(tinstr)) { + /* Thumb-2 32-bit */ + u16 tinstr2 = 0; + + fault = probe_kernel_address(ptr + 1, tinstr2); + if (!fault) { + tinstr2 = __mem_to_opcode_thumb16(tinstr2); + *pc_instrptr = __opcode_thumb32_compose(tinstr, tinstr2); + instr_mode = THUMB2_INSTR_MODE; + } + } else { + *pc_instrptr = thumb2arm(tinstr); + instr_mode = THUMB_INSTR_MODE; + } + } + } else { + fault = probe_kernel_address((void *)instrptr, *pc_instrptr); + if (!fault) { + *pc_instrptr = __mem_to_opcode_arm(*pc_instrptr); + instr_mode = ARM_INSTR_MODE; + } + } + return instr_mode; +} + /* * Convert Thumb-2 32 bit LDM, STM, LDRD, STRD to equivalent instruction * handlable by ARM alignment handler, also find the corresponding handler, @@ -775,42 +822,24 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) unsigned long instr = 0, instrptr; int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs); unsigned int type; - unsigned int fault; u16 tinstr = 0; int isize = 4; int thumb2_32b = 0; + unsigned long pc_instr_mode; + + pc_instr_mode = fetch_usr_pc_instr(regs, &instr); if (interrupts_enabled(regs)) local_irq_enable(); instrptr = instruction_pointer(regs); - - if (thumb_mode(regs)) { - u16 *ptr = (u16 *)(instrptr & ~1); - fault = probe_kernel_address(ptr, tinstr); - tinstr = __mem_to_opcode_thumb16(tinstr); - if (!fault) { - if (cpu_architecture() >= CPU_ARCH_ARMv7 && - IS_T32(tinstr)) { - /* Thumb-2 32-bit */ - u16 tinst2 = 0; - fault = probe_kernel_address(ptr + 1, tinst2); - tinst2 = __mem_to_opcode_thumb16(tinst2); - instr = __opcode_thumb32_compose(tinstr, tinst2); - thumb2_32b = 1; - } else { - isize = 2; - instr = thumb2arm(tinstr); - } - } - } else { - fault = probe_kernel_address((void *)instrptr, instr); - instr = __mem_to_opcode_arm(instr); - } - - if (fault) { + if (pc_instr_mode == INVALID_INSTR_MODE) { type = TYPE_FAULT; goto bad_or_fault; + } else if (pc_instr_mode == THUMB_INSTR_MODE) { + isize = 2; + } else if (pc_instr_mode == THUMB2_INSTR_MODE) { + thumb2_32b = 1; } if (user_mode(regs)) -- 2.12.3

6 years

1
0
0 0

[PATCH v2 3/3] ima: show rules with IMA_INMASK correctly

by Roberto Sassu

Show the '^' character when a policy rule has flag IMA_INMASK. Fixes: 80eae209d63ac ("IMA: allow reading back the current IMA policy") Signed-off-by: Roberto Sassu <roberto.sassu(a)huawei.com> Cc: stable(a)vger.kernel.org --- security/integrity/ima/ima_policy.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index e0cc323f948f..ae4034f041c4 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -1146,10 +1146,10 @@ enum { }; static const char *const mask_tokens[] = { - "MAY_EXEC", - "MAY_WRITE", - "MAY_READ", - "MAY_APPEND" + "^MAY_EXEC", + "^MAY_WRITE", + "^MAY_READ", + "^MAY_APPEND" }; #define __ima_hook_stringify(str) (#str), @@ -1209,6 +1209,7 @@ int ima_policy_show(struct seq_file *m, void *v) struct ima_rule_entry *entry = v; int i; char tbuf[64] = {0,}; + int offset = 0; rcu_read_lock(); @@ -1232,15 +1233,17 @@ int ima_policy_show(struct seq_file *m, void *v) if (entry->flags & IMA_FUNC) policy_func_show(m, entry->func); - if (entry->flags & IMA_MASK) { + if ((entry->flags & IMA_MASK) || (entry->flags & IMA_INMASK)) { + if (entry->flags & IMA_MASK) + offset = 1; if (entry->mask & MAY_EXEC) - seq_printf(m, pt(Opt_mask), mt(mask_exec)); + seq_printf(m, pt(Opt_mask), mt(mask_exec) + offset); if (entry->mask & MAY_WRITE) - seq_printf(m, pt(Opt_mask), mt(mask_write)); + seq_printf(m, pt(Opt_mask), mt(mask_write) + offset); if (entry->mask & MAY_READ) - seq_printf(m, pt(Opt_mask), mt(mask_read)); + seq_printf(m, pt(Opt_mask), mt(mask_read) + offset); if (entry->mask & MAY_APPEND) - seq_printf(m, pt(Opt_mask), mt(mask_append)); + seq_printf(m, pt(Opt_mask), mt(mask_append) + offset); seq_puts(m, " "); } -- 2.17.1

6 years

2
1
0 0

[PATCH v2 1/3] evm: check hash algorithm passed to init_desc()

by Roberto Sassu

This patch prevents memory access beyond the evm_tfm array by checking the validity of the index (hash algorithm) passed to init_desc(). The hash algorithm can be arbitrarily set if the security.ima xattr type is not EVM_XATTR_HMAC. Fixes: 5feeb61183dde ("evm: Allow non-SHA1 digital signatures") Signed-off-by: Roberto Sassu <roberto.sassu(a)huawei.com> Cc: stable(a)vger.kernel.org --- security/integrity/evm/evm_crypto.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c index e11564eb645b..82a38e801ee4 100644 --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c @@ -89,6 +89,9 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo) tfm = &hmac_tfm; algo = evm_hmac; } else { + if (hash_algo >= HASH_ALGO__LAST) + return ERR_PTR(-EINVAL); + tfm = &evm_tfm[hash_algo]; algo = hash_algo_name[hash_algo]; } -- 2.17.1

6 years

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror