This is the start of the stable review cycle for the 5.9.14 release.
There are 75 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, 12 Dec 2020 14:25:47 +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.9.14-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.9.14-rc1
Masami Hiramatsu <[email protected]>
x86/insn-eval: Use new for_each_insn_prefix() macro to loop over prefixes bytes
Pablo Neira Ayuso <[email protected]>
netfilter: nftables_offload: build mask based from the matching bytes
Pablo Neira Ayuso <[email protected]>
netfilter: nftables_offload: set address type in control dissector
Florian Westphal <[email protected]>
netfilter: nf_tables: avoid false-postive lockdep splat
Luo Meng <[email protected]>
Input: i8042 - fix error return code in i8042_setup_aux()
Mike Snitzer <[email protected]>
dm writecache: remove BUG() and fail gracefully instead
Zhihao Cheng <[email protected]>
i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc()
Robert Foss <[email protected]>
i2c: qcom: Fix IRQ error misassignement
Dan Carpenter <[email protected]>
rtw88: debug: Fix uninitialized memory in debugfs code
Bob Peterson <[email protected]>
gfs2: Don't freeze the file system during unmount
Alexander Aring <[email protected]>
gfs2: Fix deadlock dumping resource group glocks
Luo Meng <[email protected]>
ASoC: wm_adsp: fix error return code in wm_adsp_load()
Hoang Huu Le <[email protected]>
tipc: fix a deadlock when flushing scheduled work
Eric Dumazet <[email protected]>
netfilter: ipset: prevent uninit-value in hash_ip6_add
Bob Peterson <[email protected]>
gfs2: check for empty rgrp tree in gfs2_ri_update
Oliver Hartkopp <[email protected]>
can: af_can: can_rx_unregister(): remove WARN() statement from list operation sanity check
Willy Tarreau <[email protected]>
lib/syscall: fix syscall registers retrieval on 32-bit platforms
Roman Gushchin <[email protected]>
mm: memcg/slab: fix obj_cgroup_charge() return value handling
Suravee Suthikulpanit <[email protected]>
iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
Alex Deucher <[email protected]>
Revert "amd/amdgpu: Disable VCN DPG mode for Picasso"
Mike Kravetz <[email protected]>
hugetlb_cgroup: fix offline of hugetlb cgroup with reservations
Qian Cai <[email protected]>
mm/swapfile: do not sleep with a spin lock held
Yang Shi <[email protected]>
mm: list_lru: set shrinker map bit when child nr_items is not zero
Menglong Dong <[email protected]>
coredump: fix core_pattern parse error
Masami Hiramatsu <[email protected]>
x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes
Mike Snitzer <[email protected]>
dm: remove invalid sparse __acquires and __releases annotations
Mike Snitzer <[email protected]>
dm: fix double RCU unlock in dm_dax_zero_page_range() error path
Sergei Shtepa <[email protected]>
dm: fix bug with RCU locking in dm_blk_report_zones
Laurent Vivier <[email protected]>
powerpc/pseries: Pass MSI affinity to irq_create_mapping()
Laurent Vivier <[email protected]>
genirq/irqdomain: Add an irq_create_mapping_affinity() function
Nicholas Piggin <[email protected]>
powerpc/64s/powernv: Fix memory corruption when saving SLB entries on MCE
Mikulas Patocka <[email protected]>
dm writecache: fix the maximum number of arguments
Mikulas Patocka <[email protected]>
dm writecache: advance the number of arguments when reporting max_age
Pavel Begunkov <[email protected]>
io_uring: fix recvmsg setup with compat buf-select
Suganath Prabu S <[email protected]>
scsi: mpt3sas: Fix ioctl timeout
Greg Kurz <[email protected]>
KVM: PPC: Book3S HV: XIVE: Fix vCPU id sanity check
Chris Wilson <[email protected]>
drm/i915/gt: Program mocs:63 for cache eviction on gen9
Chris Wilson <[email protected]>
drm/i915/gt: Limit frequency drop to RPe on parking
Venkata Ramana Nayana <[email protected]>
drm/i915/gt: Retain default context state across shrinking
Boyuan Zhang <[email protected]>
drm/amdgpu/vcn3.0: remove old DPG workaround
Boyuan Zhang <[email protected]>
drm/amdgpu/vcn3.0: stall DPG when WPTR/RPTR reset
Tomi Valkeinen <[email protected]>
drm/omap: sdi: fix bridge enable/disable
Mika Westerberg <[email protected]>
thunderbolt: Fix use-after-free in remove_unplugged_switch()
Steven Rostedt (VMware) <[email protected]>
tracing: Fix userstacktrace option for instances
Christian Eggers <[email protected]>
i2c: imx: Don't generate STOP condition if arbitration has been lost
Christian Eggers <[email protected]>
i2c: imx: Check for I2SR_IAL after every byte
Christian Eggers <[email protected]>
i2c: imx: Fix reset of I2SR_IAL flag
Alexander Gordeev <[email protected]>
s390/pci: fix CPU address in MSI for directed IRQ
Andreas Gruenbacher <[email protected]>
gfs2: Fix deadlock between gfs2_{create_inode,inode_lookup} and delete_work_func
Andreas Gruenbacher <[email protected]>
gfs2: Upgrade shared glocks for atime updates
Aurelien Aptel <[email protected]>
cifs: add NULL check for ses->tcon_ipc
Ronnie Sahlberg <[email protected]>
cifs: refactor create_sd_buf() and and avoid corrupting the buffer
Paulo Alcantara <[email protected]>
cifs: fix potential use-after-free in cifs_echo_request()
Paulo Alcantara <[email protected]>
cifs: allow syscalls to be restarted in __smb_send_rqst()
Naveen N. Rao <[email protected]>
ftrace: Fix DYNAMIC_FTRACE_WITH_DIRECT_CALLS dependency
Naveen N. Rao <[email protected]>
ftrace: Fix updating FTRACE_FL_TRAMP
Steven Rostedt (VMware) <[email protected]>
ring-buffer: Always check to put back before stamp when crossing pages
Andrea Righi <[email protected]>
ring-buffer: Set the right timestamp in the slow path of __rb_reserve_next()
Steven Rostedt (VMware) <[email protected]>
ring-buffer: Update write stamp with the correct ts
Takashi Iwai <[email protected]>
ALSA: hda/generic: Add option to enforce preferred_dacs pairs
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fixed Dell AIO wrong sound tone
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add new codec supported for ALC897
Jian-Hong Pan <[email protected]>
ALSA: hda/realtek: Enable headset of ASUS UX482EG & B9400CEA with ALC294
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Fix bass speaker DAC assignment on Asus Zephyrus G14
Samuel Thibault <[email protected]>
speakup: Reject setting the speakup line discipline outside of speakup
Jann Horn <[email protected]>
tty: Fix ->session locking
Jann Horn <[email protected]>
tty: Fix ->pgrp locking in tiocspgrp()
Bjørn Mork <[email protected]>
USB: serial: option: fix Quectel BG96 matching
Giacinto Cifelli <[email protected]>
USB: serial: option: add support for Thales Cinterion EXS82
Vincent Palatin <[email protected]>
USB: serial: option: add Fibocom NL668 variants
Johan Hovold <[email protected]>
USB: serial: ch341: sort device-id entries
Jan-Niklas Burfeind <[email protected]>
USB: serial: ch341: add new Product ID for CH341A
Johan Hovold <[email protected]>
USB: serial: kl5kusb105: fix memleak on open
Vamsi Krishna Samavedam <[email protected]>
usb: gadget: f_fs: Use local copy of descriptors for userspace copy
-------------
Diffstat:
Makefile | 4 +-
arch/powerpc/kvm/book3s_xive.c | 7 +--
arch/powerpc/platforms/powernv/setup.c | 9 +++-
arch/powerpc/platforms/pseries/msi.c | 3 +-
arch/s390/pci/pci_irq.c | 14 ++++--
arch/x86/include/asm/insn.h | 15 +++++++
arch/x86/kernel/uprobes.c | 10 +++--
arch/x86/lib/insn-eval.c | 5 ++-
drivers/accessibility/speakup/spk_ttyio.c | 37 +++++++++------
drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +-
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 25 ++++++++---
drivers/gpu/drm/i915/gt/intel_mocs.c | 14 +++++-
drivers/gpu/drm/i915/gt/intel_rps.c | 4 ++
drivers/gpu/drm/i915/gt/shmem_utils.c | 7 ++-
drivers/gpu/drm/omapdrm/dss/sdi.c | 10 ++---
drivers/i2c/busses/i2c-imx.c | 44 ++++++++++++++----
drivers/i2c/busses/i2c-qcom-cci.c | 4 +-
drivers/i2c/busses/i2c-qup.c | 3 +-
drivers/input/serio/i8042.c | 3 +-
drivers/iommu/amd/amd_iommu_types.h | 2 +-
drivers/md/dm-writecache.c | 6 ++-
drivers/md/dm.c | 10 ++---
drivers/net/wireless/realtek/rtw88/debug.c | 2 +
drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +-
drivers/thunderbolt/icm.c | 10 +++--
drivers/tty/tty_io.c | 7 ++-
drivers/tty/tty_jobctrl.c | 44 ++++++++++++------
drivers/usb/gadget/function/f_fs.c | 6 ++-
drivers/usb/serial/ch341.c | 5 ++-
drivers/usb/serial/kl5kusb105.c | 10 ++---
drivers/usb/serial/option.c | 10 +++--
fs/cifs/connect.c | 5 ++-
fs/cifs/smb2pdu.c | 71 +++++++++++++++--------------
fs/cifs/smb2pdu.h | 2 -
fs/cifs/transport.c | 4 +-
fs/coredump.c | 3 +-
fs/gfs2/glops.c | 5 ++-
fs/gfs2/inode.c | 42 ++++++++++++-----
fs/gfs2/rgrp.c | 4 ++
fs/io_uring.c | 3 +-
include/linux/irqdomain.h | 12 ++++-
include/linux/tty.h | 4 ++
include/net/netfilter/nf_tables_offload.h | 7 +++
kernel/irq/irqdomain.c | 13 +++---
kernel/trace/Kconfig | 2 +-
kernel/trace/ftrace.c | 22 ++++++++-
kernel/trace/ring_buffer.c | 20 ++++-----
kernel/trace/trace.c | 13 +++---
lib/syscall.c | 11 ++++-
mm/hugetlb_cgroup.c | 8 ++--
mm/list_lru.c | 10 ++---
mm/slab.h | 42 ++++++++++-------
mm/swapfile.c | 4 +-
net/can/af_can.c | 7 ++-
net/netfilter/ipset/ip_set_core.c | 3 +-
net/netfilter/nf_tables_api.c | 3 +-
net/netfilter/nf_tables_offload.c | 17 +++++++
net/netfilter/nft_cmp.c | 8 ++--
net/netfilter/nft_meta.c | 16 +++----
net/netfilter/nft_payload.c | 70 ++++++++++++++++++++++-------
net/tipc/core.c | 9 ++--
net/tipc/core.h | 8 ++++
net/tipc/net.c | 20 +++------
net/tipc/net.h | 1 +
sound/pci/hda/hda_generic.c | 12 +++--
sound/pci/hda/hda_generic.h | 1 +
sound/pci/hda/patch_realtek.c | 72 +++++++++++++++++++++++++++---
sound/soc/codecs/wm_adsp.c | 1 +
tools/arch/x86/include/asm/insn.h | 15 +++++++
69 files changed, 633 insertions(+), 272 deletions(-)
From: Kailang Yang <[email protected]>
commit 92666d45adcfd4a4a70580ff9f732309e16131f9 upstream.
This platform only had one audio jack.
If it plugged speaker then replug with speaker or headset, the sound
tone will change to abnormal.
Headset Mic also can't record when this issue was happen.
[ Added a short comment about the COEF by tiwai ]
Signed-off-by: Kailang Yang <[email protected]>
Cc: <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
sound/pci/hda/patch_realtek.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -119,6 +119,7 @@ struct alc_spec {
unsigned int no_shutup_pins:1;
unsigned int ultra_low_power:1;
unsigned int has_hs_key:1;
+ unsigned int no_internal_mic_pin:1;
/* for PLL fix */
hda_nid_t pll_nid;
@@ -4524,6 +4525,7 @@ static const struct coef_fw alc225_pre_h
static void alc_headset_mode_unplugged(struct hda_codec *codec)
{
+ struct alc_spec *spec = codec->spec;
static const struct coef_fw coef0255[] = {
WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */
WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */
@@ -4598,6 +4600,11 @@ static void alc_headset_mode_unplugged(s
{}
};
+ if (spec->no_internal_mic_pin) {
+ alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);
+ return;
+ }
+
switch (codec->core.vendor_id) {
case 0x10ec0255:
alc_process_coef_fw(codec, coef0255);
@@ -5164,6 +5171,11 @@ static void alc_determine_headset_type(s
{}
};
+ if (spec->no_internal_mic_pin) {
+ alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);
+ return;
+ }
+
switch (codec->core.vendor_id) {
case 0x10ec0255:
alc_process_coef_fw(codec, coef0255);
@@ -6137,6 +6149,23 @@ static void alc274_fixup_hp_headset_mic(
}
}
+static void alc_fixup_no_int_mic(struct hda_codec *codec,
+ const struct hda_fixup *fix, int action)
+{
+ struct alc_spec *spec = codec->spec;
+
+ switch (action) {
+ case HDA_FIXUP_ACT_PRE_PROBE:
+ /* Mic RING SLEEVE swap for combo jack */
+ alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);
+ spec->no_internal_mic_pin = true;
+ break;
+ case HDA_FIXUP_ACT_INIT:
+ alc_combo_jack_hp_jd_restart(codec);
+ break;
+ }
+}
+
/* for hda_fixup_thinkpad_acpi() */
#include "thinkpad_helper.c"
@@ -6336,6 +6365,7 @@ enum {
ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,
ALC287_FIXUP_HP_GPIO_LED,
ALC256_FIXUP_HP_HEADSET_MIC,
+ ALC236_FIXUP_DELL_AIO_HEADSET_MIC,
};
static const struct hda_fixup alc269_fixups[] = {
@@ -7753,6 +7783,12 @@ static const struct hda_fixup alc269_fix
.type = HDA_FIXUP_FUNC,
.v.func = alc274_fixup_hp_headset_mic,
},
+ [ALC236_FIXUP_DELL_AIO_HEADSET_MIC] = {
+ .type = HDA_FIXUP_FUNC,
+ .v.func = alc_fixup_no_int_mic,
+ .chained = true,
+ .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
+ },
};
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7830,6 +7866,8 @@ static const struct snd_pci_quirk alc269
SND_PCI_QUIRK(0x1028, 0x097d, "Dell Precision", ALC289_FIXUP_DUAL_SPK),
SND_PCI_QUIRK(0x1028, 0x098d, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),
SND_PCI_QUIRK(0x1028, 0x09bf, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),
+ SND_PCI_QUIRK(0x1028, 0x0a2e, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),
+ SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),
SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -8369,6 +8407,8 @@ static const struct snd_hda_pin_quirk al
{0x19, 0x02a11020},
{0x1a, 0x02a11030},
{0x21, 0x0221101f}),
+ SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC,
+ {0x21, 0x02211010}),
SND_HDA_PIN_QUIRK(0x10ec0236, 0x103c, "HP", ALC256_FIXUP_HP_HEADSET_MIC,
{0x14, 0x90170110},
{0x19, 0x02a11020},
From: Steven Rostedt (VMware) <[email protected]>
commit 55ea4cf403800af2ce6b125bc3d853117e0c0456 upstream.
The write stamp, used to calculate deltas between events, was updated with
the stale "ts" value in the "info" structure, and not with the updated "ts"
variable. This caused the deltas between events to be inaccurate, and when
crossing into a new sub buffer, had time go backwards.
Link: https://lkml.kernel.org/r/[email protected]
Cc: [email protected]
Fixes: a389d86f7fd09 ("ring-buffer: Have nested events still record running time stamp")
Reported-by: "J. Avila" <[email protected]>
Tested-by: Daniel Mentz <[email protected]>
Tested-by: Will McVicker <[email protected]>
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
kernel/trace/ring_buffer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -3291,7 +3291,7 @@ __rb_reserve_next(struct ring_buffer_per
/* Nothing came after this event between C and E */
info->delta = ts - info->after;
(void)rb_time_cmpxchg(&cpu_buffer->write_stamp,
- info->after, info->ts);
+ info->after, ts);
info->ts = ts;
} else {
/*
On Thu, 2020-12-10 at 15:26 +0100, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.9.14 release.
> There are 75 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, 12 Dec 2020 14:25:47 +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.9.14-rc1.gz
> or in the git tree and branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-
> stable-rc.git linux-5.9.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
>
hello,
Compiled and booted 5.9.14-rc1+. No typical dmesg regression or
regressions.
Tested-by: Jeffrin Jose T <[email protected]>
--
software engineer
rajagiri school of engineering and technology - autonomous
On Thu, 10 Dec 2020 at 20:08, Greg Kroah-Hartman
<[email protected]> wrote:
>
> This is the start of the stable review cycle for the 5.9.14 release.
> There are 75 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, 12 Dec 2020 14:25:47 +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.9.14-rc1.gz
> or in the git tree and branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.9.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Tested-by: Linux Kernel Functional Testing <[email protected]>
Summary
------------------------------------------------------------------------
kernel: 5.9.14-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.9.y
git commit: 81beabff31a7c60d2065f5711ffda6d97776a728
git describe: v5.9.13-77-g81beabff31a7
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.9.y/build/v5.9.13-77-g81beabff31a7
No regressions (compared to build v5.9.13)
No fixes (compared to build v5.9.13)
Ran 57691 total tests in the following environments and test suites.
Environments
--------------
- arc
- arm
- arm64
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- mips
- nxp-ls2088
- parisc
- powerpc
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-i386-clang
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
- qemu_arm
- qemu_arm64
- qemu_arm64-compat
- qemu_i386
- qemu_x86_64
- qemu_x86_64-compat
- riscv
- s390
- sh
- sparc
- x15
- x86
- x86-kasan
Test Suites
-----------
* build
* linux-log-parser
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-mm-tests
* ltp-sched-tests
* ltp-syscalls-tests
* perf
* v4l2-compliance
* kvm-unit-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-dio-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-tracing-tests
* network-basic-tests
* ltp-controllers-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-securebits-tests
* ltp-fcntl-locktests-tests
* kunit
* rcutorture
* fwts
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
--
Linaro LKFT
https://lkft.linaro.org
From: Andrea Righi <[email protected]>
commit 8785f51a17083eee7c37606079c6447afc6ba102 upstream.
In the slow path of __rb_reserve_next() a nested event(s) can happen
between evaluating the timestamp delta of the current event and updating
write_stamp via local_cmpxchg(); in this case the delta is not valid
anymore and it should be set to 0 (same timestamp as the interrupting
event), since the event that we are currently processing is not the last
event in the buffer.
Link: https://lkml.kernel.org/r/X8IVJcp1gRE+FJCJ@xps-13-7390
Cc: Ingo Molnar <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: [email protected]
Link: https://lwn.net/Articles/831207
Fixes: a389d86f7fd0 ("ring-buffer: Have nested events still record running time stamp")
Signed-off-by: Andrea Righi <[email protected]>
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
kernel/trace/ring_buffer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -3287,11 +3287,11 @@ __rb_reserve_next(struct ring_buffer_per
ts = rb_time_stamp(cpu_buffer->buffer);
barrier();
/*E*/ if (write == (local_read(&tail_page->write) & RB_WRITE_MASK) &&
- info->after < ts) {
+ info->after < ts &&
+ rb_time_cmpxchg(&cpu_buffer->write_stamp,
+ info->after, ts)) {
/* Nothing came after this event between C and E */
info->delta = ts - info->after;
- (void)rb_time_cmpxchg(&cpu_buffer->write_stamp,
- info->after, ts);
info->ts = ts;
} else {
/*
On Thu, Dec 10, 2020 at 03:26:25PM +0100, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.9.14 release.
> There are 75 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, 12 Dec 2020 14:25:47 +0000.
> Anything received after that time might be too late.
>
Build results:
total: 154 pass: 154 fail: 0
Qemu test results:
total: 426 pass: 426 fail: 0
Tested-by: Guenter Roeck <[email protected]>
Guenter
On Thu, Dec 10, 2020 at 03:46:23PM -0800, Guenter Roeck wrote:
> On Thu, Dec 10, 2020 at 03:26:25PM +0100, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 5.9.14 release.
> > There are 75 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, 12 Dec 2020 14:25:47 +0000.
> > Anything received after that time might be too late.
> >
>
> Build results:
> total: 154 pass: 154 fail: 0
> Qemu test results:
> total: 426 pass: 426 fail: 0
>
> Tested-by: Guenter Roeck <[email protected]>
Thanks for testing all of these and letting me know.
greg k-h
On Fri, Dec 11, 2020 at 11:01:31AM +0530, Naresh Kamboju wrote:
> On Thu, 10 Dec 2020 at 20:08, Greg Kroah-Hartman
> <[email protected]> wrote:
> >
> > This is the start of the stable review cycle for the 5.9.14 release.
> > There are 75 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, 12 Dec 2020 14:25:47 +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.9.14-rc1.gz
> > or in the git tree and branch at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.9.y
> > and the diffstat can be found below.
> >
> > thanks,
> >
> > greg k-h
>
> Results from Linaro’s test farm.
> No regressions on arm64, arm, x86_64, and i386.
>
> Tested-by: Linux Kernel Functional Testing <[email protected]>
Thanks for testing them all and letting me know.
greg k-h