Merge 78a2cbd8 ("Merge tag 'libnvdimm-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ie2624278534a61a472d384eefea060285228fbbd
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 2c22dc1e ("Merge tag 'mailbox-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: If185196ed354ae513fc683bd8bfd54f88a461a4e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 2d32fba0 ("Merge tag 'pinctrl-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I8be810e5c2d321193812044a614484d1a9b7d32e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 70dbb12e ("Merge tag 'i2c-for-6.13-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I0f4f02ca4a1a0bbb24f0b925317ba35323ce531d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 5d38cb9b ("Merge tag 'firewire-updates-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ia413e5cf5578635cb77f8329ac8e63ee61e77eea
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge e06635e2 ("Merge tag 'slab-for-6.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I2bc3beb25eeda521f43a3398a98774ed8be43b62
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge f5f4745a ("Merge tag 'mm-nonmm-stable-2024-11-24-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ifc9d4c8627de3000229cf5fdb96940abd5e59c7b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 7f4f3b14 ("Merge tag 'trace-rust-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I83f0f2ab637e765da94b60a472b3c5c73498a3dc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 36843bfb ("Merge tag 'hardening-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I5f37ec9b23289a4c90eafaca552df24e4042820e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 4e07155d ("Merge tag 'fbdev-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I7133668fead493959f4c5b0ddd3b667851c39bc3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 3e51108c ("Merge tag 'input-for-v6.13-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I1fb4ae1ccfa9e8139df912cb5655118d5b89ae9e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 9f16d5e6 ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I92f8d298856ee972cb22d3c37ea06b5fb79be459
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 42d9e8b7 ("Merge tag 'powerpc-6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Idc4c869b23d6a885aa3706665dc17296ab362bf5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 5c00ff74 ("Merge tag 'mm-stable-2024-11-18-19-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I3dd4cc4e9f6cda049df70688b4318d1a19e963e9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I53e428ee5334506d515e1d1a7ae3a87361da4694
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 0938b161 ("mm: don't set readahead flag on a folio when lookahead_size > nr_to_read") into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I139a93bb9e592f4facfb50731a2b23c57ae86392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I30c4afe3099b22e2ffe05924c98388b165111806
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: Ib96aa5ada1c93e64880dc5c84f450c5d0fca6e88
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I07b99346ed01b4217375f0a719080876460c468e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

This reverts commit 7d91e4ee.

Change-Id: Id28ff300b0141f07848a7c14e2dcb6fe734e4b15
Signed-off-by: T.J. Mercier <tjmercier@google.com>

Merge e26060d1 ("mm: swap: make some count_mthp_stat() call-sites be THP-agnostic.") into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I9d399f315947ddedc5913b7caad55c73a1312493
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 7aefa598 ("powerpc: assert_pte_locked() use pte_offset_map_ro_nolock()") into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I88a3006f8619054992a6d5b528a1bbb198562b2d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 228a1157 ("Merge tag '6.13-rc-part1-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I91f89c486d21d1e0a4512d7289bae461ed11c448
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge e7675238 ("Merge tag 'ovl-update-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs"

) into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	fs/fuse/passthrough.c
	kernel/cred.c

Change-Id: Ib820011dd423ae79e29269a618e8ac6e6bc8b5bc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 060fc106 ("Merge tag 'unicode-next-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I0d94c69a6ce449bc8d5d13f15c19ca887bab8e5b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

This reverts commit 90f11a7d.

The override_creds patches are no longer needed thanks to the work
documented in the below bug.

Test: adb remount still works
Bug: 388912628
Change-Id: I06aa77f6111fc6651ce4f250bf0ff41c52f51e4d
Signed-off-by: Paul Lawrence <paullawrence@google.com>

I encountered an issue where Perfetto sometimes fails to display the
blocked function when a thread enters the D state.

The problem arises from the caller value in the trace_sched_blocked_reason,
and I observed the following outputs while using bpftrace:

bpftrace -e 't:sched:sched_blocked_reason /args.caller > 0 &&
args.caller < 0xFFFFFFFF/ {@[args.caller]=count();}'
Attaching 1 probe...
^C

@[0x26a8]: 1
@[0x188]: 1
@[0x3]: 1
@[0xf833]: 1
@[0x4]: 10
@[0x9]: 14
@[0x1]: 23

When try_to_wake_up is waking a thread executing __schedule, it can trigger
the trace_sched_blocked_reason. This function attempts to obtain the
thread's backtrace using __get_wchan. However, __get_wchan requires the
thread to be blocking in cpu_switch_to, which is not always the case.

                                         | set_current_state(TASK_UNINTERRUPTIBLE)
                                         | __schedule
                                         |   deactivate_task
                                         |     p->on_rq = 0
                                         |     dequeue_task
try_to_wake_up                           |   pick_next_task
  ttwu_state_match(TASK_UNINTERRUPTIBLE) |   context_switch
  p->on_rq == 0                          |     prepare_task_switch
  p->__state & TASK_UNINTERRUPTIBLE      |     switch_mm
    trace_sched_blocked_reason           |     __switch_to
      __get_wchan                        |       ......
        unwind_init_from_task            |       cpu_switch_to
          state->fp = thread_saved_fp(p) |         mov x10, #THREAD_CPU_CONTEXT
            // Load an invalid fp        |         add x8, x0, x10
                                         |         ......
                                         |         stp fp, x9, [x8], #16
                                         |         str lr, [x8]
                                         |         ......
                                         |         ret

To resolve this, we can move the trace_sched_blocked_reason call inside
__schedule to ensure accurate caller information.

Fixes: 44447dec ("ANDROID: sched: move blocked reason trace point to cover all class")
Change-Id: Ib63839107dbe835a52f191cceef9452d13e18785
Signed-off-by: pengdonglin <pengdonglin@xiaomi.com>

Merge ceba6f6f ("Merge tag 'iommu-updates-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I8012c75c0622badaccced6561cfc7d8ba6c2acd8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge eb78332b ("Merge tag 'thermal-6.13-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Idf88bb0f1e2e27af607fc1f05fbca2e09b6db9c5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 93251bdf ("Merge tag 'leds-next-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I886bab96829c466690f3e948566cc9077d4124aa
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 06afb0f3 ("Merge tag 'trace-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I03f13aa88ff45410824c1c9d8ea793ff4c3a134f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

In commit a9cfb877 ("tracing: Introduce tracepoint extended
structure"), the tracepoint structure changed to save space when not
enabled.  Update the DEFINE_HOOK_FN() to work properly with these
changes as well.

Fixes: a9cfb877 ("tracing: Introduce tracepoint extended structure")
Change-Id: Ic1b190e502b175a528c7dda5f33f32244f9c834d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I20d5a05b2fdd7acac10b4751d50c6254f3068c1e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I51d5ede4811cf586d9d99aff905e91fbb71817d9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

In commit 4a8840af ("tracepoints: Use new static branch API"), the
tracing infrastructure finally moved over to use the "new" static
branch apis fully, breaking the android tracepoint macros/functions.
Convert our out-of-tree tracepoint logic to use the static branch apis
as well, fixing everything up properly.

Fixes: 4a8840af ("tracepoints: Use new static branch API")
Change-Id: I9cd70f1c9efc255b4d67b63664971f35d5830183
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: If6467523b899d96db554e567fbabf90240db2a82
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 4b017123 ("Merge tag 'trace-tools-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Id6330ed53ee632cfc9a862b017c28b156a41879f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge f1db8258 ("Merge tag 'trace-ring-buffer-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ibbd72610cb1e92f5bb5379fdb779e618260ac972
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Map the permission gating RTM_GETNEIGH/RTM_GETNEIGHTBL messages to a
new permission so that it can be distinguished from the other netlink
route permissions in selinux policy. The new permission is triggered by
a flag set in system images T and up.

While the kernel supports the new nlmsg extended permission, the policy
does not yet contain the new rules. Keep the support for the
Android-specific policy until the new policy lands.

Bug: 392913234
Bug: 353255679
Test: atest CtsSelinuxTargetSdk25TestCases
Test: atest CtsSelinuxTargetSdk27TestCases
Test: atest CtsSelinuxTargetSdk28TestCases
Test: atest CtsSelinuxTargetSdk29TestCases
Test: atest CtsSelinuxTargetSdk30TestCases
Test: atest CtsSelinuxTargetSdkCurrentTestCases
Signed-off-by: Bram Bonné <brambonne@google.com>
Signed-off-by: Thiébaud Weksteen <tweek@google.com>
Change-Id: I8b34841d7afc97ec1db5dc01444fa26eb68a6e4b

Map the permission gating RTM_GETLINK messages to a new permission so
that it can be distinguished from the other netlink route permissions
in selinux policy.

While the kernel supports the new nlmsg extended permission, the policy
does not yet contain the new rules. Keep the support for the
Android-specific policy until the new policy lands.

Bug: 392913234
Bug: 353255679
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Signed-off-by: Thiébaud Weksteen <tweek@google.com>
Change-Id: I83c9b693009a49aa1c7a18102f1b8cea24cd55ee