From: weilin.wang@intel.com To: weilin.wang@intel.com, Namhyung Kim , Ian Rogers , Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Perry Taylor , Samantha Alt , Caleb Biggers Subject: [RFC PATCH v15 0/8] TPEBS counting mode support Date: Tue, 2 Jul 2024 18:07:47 -0400 Message-ID: <20240702220757.262825-1-weilin.wang@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265811 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-perf-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Weilin Wang Changes in v15: - Revert changes added for python import test failure in v14 because the code works correctly with the new python build code. - Update the command line option to --record-tpebs. Changes in v14: - Fix the python import test failure. We cannot support PYTHON_PERF because it will trigger a chain of dependency issues if we add intel-tpebs.c to it. So, only enable tpebs functions in evsel and evlist when PYTHON_PERF is not defined. - Fix shellcheck warning for the tpebs test. Changes in v13: - Add document for the command line option and fix build error in non-x86_64. - Update example with non-zero retire_latency value when tpebs recording is enabled. - Add tpebs_stop() back to tpebs_set_evsel() because in hybrid platform, when the forked perf record is not killed, the reader thread does not get any sampled data from the PIPE. As a result, tpebs_set_evesel() will always return zero on retire_latency values. This does not happen on my test GNR machine. Since -I is not supported yet, I think we should add tpebs_stop() to ensure correctness for now. More investigation is required here when we work on supporting -I mode. - Rebase code on top of perf-tools-next. Changes in v12: - Update MTL metric JSON file to include E-Core TMA3.6 changes. - Update comments and code for better code quality. Keep tpebs_start() and tpebs_delete() at evsel level for now and add comments on these functions with more details about potential future changes. Remove tpebs_stop() call from tpebs_set_evsel(). Simplify the tpebs_start() and tpebs_stop()/tpebs_delete() interfaces. Also fixed the bugs on not freed "new" pointer and the incorrect variable value assignment to val instead of counter->val. Changes in v11: - Make retire_latency evsels not opened for counting. This works correctly now with the code Namhyung suggested that adjusting group read size when retire_latency evsels included in the group. - Update retire_latency value assignment using rint() to reduce precision loss while keeping code generic. - Fix the build error caused by not used variable in the test. Other changes in v10: - Change perf record fork from perf stat to evsel. All the major operations like tpebs start, stop, read_evsel should directly work through evsel. - Make intel-tpebs x86_64 only. This change is cross-compiled to arm64. - Put tpebs code to intel-tepbs and simplify intel-tpebs APIs to minimum number of functions and variables. Update funtion name and variable names to use consistent prefix. Also improve error handling. - Integrate code patch from Ian for the :R parser. - Update MTL metrics to TMA 4.8. V9: https://lore.kernel.org/all/20240521173952.3397644-1-weilin.wang@intel.com/ Changes in v9: - Update the retire_latency result print and metric calculation method. Plugin the value to evsel so that no special code is required. - Update --control:fifo to use pipe instead of named pipe. - Add test for TPEBS counting mode. - Update Document with more details. Changes in v8: - In this revision, the code is updated to base on Ian's patch on R modifier parser https://lore.kernel.org/lkml/20240428053616.1125891-3-irogers@google.com/ After this change, there is no special code required for R modifier in metricgroup.c and metricgroup.h files. Caveat of this change: Ideally, we will need to add special handling to skip counting events with R modifier in evsel. Currently, this is not implemented so the event with :R will be both counted and sampled. Usually, in a metric formula that uses retire_latency, it would already require to count the event. As a result, we will endup count the same event twice. This should be able to be handled properly when we finalize our design on evsel R modifier support. - Move TPEBS specific code out from main perf stat code to separate files in util/intel-tpebs.c and util/intel-tpebs.h. [Namhyung] - Use --control:fifo to ack perf stat from forked perf record instead of sleep(2) [Namhyung] - Add introductions about TPEBS and R modifier in Documents. [Namhyung] Changes in v7: - Update code and comments for better code quality [Namhyung] - Add a separate commit for perf data [Namhyung] - Update retire latency print function to improve alignment [Namhyung] Changes in v6: - Update code and add comments for better code quality [Namhyung] - Remove the added fd var and directly pass the opened fd to data.file.fd [Namhyung] - Add kill() to stop perf record when perf stat exists early [Namhyung] - Add command opt check to ensure only start perf record when -a/-C given [Namhyung] - Squash commits [Namhyung] Changes in v5: - Update code and add comments for better code quality [Ian] Changes in v4: - Remove uncessary debug print and update code and comments for better readability and quality [Namhyung] - Update mtl metric json file with consistent TmaL1 and TopdownL1 metricgroup Changes in v3: - Remove ':' when event name has '@' [Ian] - Use 'R' as the modifier instead of "retire_latency" [Ian] Changes in v2: - Add MTL metric file - Add more descriptions and example to the patch [Arnaldo] Here is an example of running perf stat to collect a metric that uses retire_latency value of event MEM_INST_RETIRED.STLB_HIT_STORES on a MTL system. In this simple example, there is no MEM_INST_RETIRED.STLB_HIT_STORES sample. Therefore, the MEM_INST_RETIRED.STLB_HIT_STORES:p count and retire_latency value are all 0. ./perf stat -M tma_dtlb_store -a -- sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.000 MB - ] Performance counter stats for 'system wide': 181,047,168 cpu_core/TOPDOWN.SLOTS/ # 0.6 % tma_dtlb_store 3,195,608 cpu_core/topdown-retiring/ 40,156,649 cpu_core/topdown-mem-bound/ 3,550,925 cpu_core/topdown-bad-spec/ 117,571,818 cpu_core/topdown-fe-bound/ 57,118,087 cpu_core/topdown-be-bound/ 69,179 cpu_core/EXE_ACTIVITY.BOUND_ON_STORES/ 4,582 cpu_core/MEM_INST_RETIRED.STLB_HIT_STORES/ 30,183,104 cpu_core/CPU_CLK_UNHALTED.DISTRIBUTED/ 30,556,790 cpu_core/CPU_CLK_UNHALTED.THREAD/ 168,486 cpu_core/DTLB_STORE_MISSES.WALK_ACTIVE/ 0.00 MEM_INST_RETIRED.STLB_HIT_STORES:p 0 0 1.003105924 seconds time elapsed v1: TPEBS is one of the features provided by the next generation of Intel PMU. Please refer to Section 8.4.1 of "Intel® Architecture Instruction Set Extensions Programming Reference" [1] for more details about this feature. This set of patches supports TPEBS in counting mode. The code works in the following way: it forks a perf record process from perf stat when retire_latency of one or more events are used in a metric formula. Perf stat would send a SIGTERM signal to perf record before it needs the retire latency value for metric calculation. Perf stat will then process sample data to extract the retire latency data for metric calculations. Currently, the code uses the arithmetic average of retire latency values. [1] https://www.intel.com/content/www/us/en/content-details/812218/intel-architecture-instruction-set-extensions-programming-reference.html?wapkw=future%20features Ian Rogers (1): perf parse-events: Add a retirement latency modifier Weilin Wang (7): perf data: Allow to use given fd in data->file.fd perf stat: Fork and launch perf record when perf stat needs to get retire latency value for a metric. perf stat: Plugin retire_lat value from sampled data to evsel perf vendor events intel: Add MTL metric json files perf stat: Add command line option for enabling tpebs recording perf Document: Add TPEBS to Documents perf test: Add test for Intel TPEBS counting mode tools/perf/Documentation/perf-list.txt | 1 + tools/perf/Documentation/perf-stat.txt | 8 + tools/perf/Documentation/topdown.txt | 30 + tools/perf/arch/x86/util/evlist.c | 6 + tools/perf/builtin-stat.c | 8 + .../arch/x86/meteorlake/metricgroups.json | 142 + .../arch/x86/meteorlake/mtl-metrics.json | 2535 +++++++++++++++++ .../perf/tests/shell/test_stat_intel_tpebs.sh | 18 + tools/perf/util/Build | 1 + tools/perf/util/data.c | 7 +- tools/perf/util/evlist.c | 2 + tools/perf/util/evsel.c | 81 +- tools/perf/util/evsel.h | 6 + tools/perf/util/intel-tpebs.c | 407 +++ tools/perf/util/intel-tpebs.h | 35 + tools/perf/util/parse-events.c | 2 + tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.l | 3 +- 18 files changed, 3289 insertions(+), 4 deletions(-) create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/metricgroups.json create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/mtl-metrics.json create mode 100755 tools/perf/tests/shell/test_stat_intel_tpebs.sh create mode 100644 tools/perf/util/intel-tpebs.c create mode 100644 tools/perf/util/intel-tpebs.h -- 2.43.0 . Date: Wed, 3 Jul 2024 08:09:29 +1000 From: Stephen Rothwell To: Andrew Morton Cc: Paul Menzel , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: Fixes tag needs some work in the mm-hotfixes tree Message-ID: <20240703080929.319d3e52@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/=uLm2ThrxjEsSbDbsMPY7l3"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265819 org.kernel.vger.linux-next:62063 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/=uLm2ThrxjEsSbDbsMPY7l3 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, In commit e968e6d21d03 ("lib/build_OID_registry: avoid non-destructive substitution= for Perl < 5.13.2 compat") Fixes tag Fixes: 5ef6dc08cfde ("lib/build_OID_registry: don't mention the full path= of has these problem(s): - Subject has leading but no trailing parentheses - Subject has leading but no trailing quotes Please do not split Fixes tags over more than one line. --=20 Cheers, Stephen Rothwell --Sig_/=uLm2ThrxjEsSbDbsMPY7l3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaEepkACgkQAVBC80lX 0Gw75Af8CTrF1A8Igob1jit9YI5K2ceQQaK+82rKIbMJcvXWzdzvTclXR+yVb7oz gpGy0hHeXRBRt16ddGnDZXUGTYo9z2YE1YhqOWmh5QfJkUaxWIPKMjKXDOOpJ9Vf pG8ddeg6ZeTf8X09AyKWcBbE9Fv8kMi62DNRkJsJeVOg4QGZxxvCDc2Tv0MRYZpt O7Vncqldu3r4HxkoRUUGOrB2WxlehkQ5q2nyZc9gBDKXMLnONP2ex83VelDdhAOv 1dssMI94nUxOQ8kJEuSsiVmSKnwd9WGKdPCIwEhq2EWbLO6oub4DL4VMZ9K2R1eq 3zIyw/PcnIsQe4kNJre7RX+4LwLv7A== =wuYU -----END PGP SIGNATURE----- --Sig_/=uLm2ThrxjEsSbDbsMPY7l3-- . From: Frank Li To: Miquel Raynal , Conor Culhane , Alexandre Belloni , linux-i3c@lists.infradead.org (moderated list:SILVACO I3C DUAL-ROLE MASTER), linux-kernel@vger.kernel.org (open list) Cc: imx@lists.linux.dev Subject: [PATCH 1/1] i3c: master: svc: Improve DAA STOP handle code logic Date: Tue, 2 Jul 2024 18:31:07 -0400 Message-Id: <20240702223107.403057-1-Frank.Li@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265827 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-i3c Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The REQUEST_PROC_DAA command behaves differently from other commands. Sometimes the hardware can auto emit STOP, but in other conditions, it cannot. Improves the code logic to better handle these situations. Hardware can auto emit STOP only when the following conditions are met: - The previous I3C device correctly returns a PID and ACKs an I3C address. - A NACK is received when emitting 7E to try to get the next I3C device's PID. In all other cases, a manual STOP emission is needed. The code is changed to emit STOP when break the while loop and 'return 0' only when the hardware can auto emit STOP. Signed-off-by: Frank Li --- drivers/i3c/master/svc-i3c-master.c | 61 ++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c index f0362509319e0..15fa56383bdc9 100644 --- a/drivers/i3c/master/svc-i3c-master.c +++ b/drivers/i3c/master/svc-i3c-master.c @@ -790,7 +790,20 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, int ret, i; while (true) { - /* Enter/proceed with DAA */ + /* SVC_I3C_MCTRL_REQUEST_PROC_DAA have two mode, ENTER DAA or PROCESS DAA. + * + * ENTER DAA: + * 1 will issue START, 7E, ENTDAA, and then emits 7E/R to process first target. + * 2 Stops just before the new Dynamic Address (DA) is to be emitted. + * + * PROCESS DAA: + * 1 The DA is written using MWDATAB or ADDR bits 6:0. + * 2 ProcessDAA is requested again to write the new address, and then starts the + * next (START, 7E, ENTDAA) unless marked to STOP; an MSTATUS indicating NACK + * means DA was not accepted (e.g. parity error). If PROCESSDAA is NACKed on the + * 7E/R, which means no more Slaves need a DA, then a COMPLETE will be signaled + * (along with DONE), and a STOP issued automatically. + */ writel(SVC_I3C_MCTRL_REQUEST_PROC_DAA | SVC_I3C_MCTRL_TYPE_I3C | SVC_I3C_MCTRL_IBIRESP_NACK | @@ -807,7 +820,7 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, SVC_I3C_MSTATUS_MCTRLDONE(reg), 1, 1000); if (ret) - return ret; + break; if (SVC_I3C_MSTATUS_RXPEND(reg)) { u8 data[6]; @@ -819,7 +832,7 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, */ ret = svc_i3c_master_readb(master, data, 6); if (ret) - return ret; + break; for (i = 0; i < 6; i++) prov_id[dev_nb] |= (u64)(data[i]) << (8 * (5 - i)); @@ -827,7 +840,7 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, /* We do not care about the BCR and DCR yet */ ret = svc_i3c_master_readb(master, data, 2); if (ret) - return ret; + break; } else if (SVC_I3C_MSTATUS_MCTRLDONE(reg)) { if (SVC_I3C_MSTATUS_STATE_IDLE(reg) && SVC_I3C_MSTATUS_COMPLETE(reg)) { @@ -835,12 +848,23 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, * All devices received and acked they dynamic * address, this is the natural end of the DAA * procedure. + * + * Hardware will auto emit STOP at this case. */ - break; + *count = dev_nb; + return 0; + } else if (SVC_I3C_MSTATUS_NACKED(reg)) { /* No I3C devices attached */ - if (dev_nb == 0) + if (dev_nb == 0) { + /* + * Hardware can't treat first NACK for ENTAA as normal + * COMPLETE. So need manual emit STOP. + */ + ret = 0; + *count = 0; break; + } /* * A slave device nacked the address, this is @@ -849,8 +873,10 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, * answer again immediately and shall ack the * address this time. */ - if (prov_id[dev_nb] == nacking_prov_id) - return -EIO; + if (prov_id[dev_nb] == nacking_prov_id) { + ret = EIO; + break; + } dev_nb--; nacking_prov_id = prov_id[dev_nb]; @@ -858,7 +884,7 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, continue; } else { - return -EIO; + break; } } @@ -870,12 +896,12 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, SVC_I3C_MSTATUS_BETWEEN(reg), 0, 1000); if (ret) - return ret; + break; /* Give the slave device a suitable dynamic address */ ret = i3c_master_get_free_addr(&master->base, last_addr + 1); if (ret < 0) - return ret; + break; addrs[dev_nb] = ret; dev_dbg(master->dev, "DAA: device %d assigned to 0x%02x\n", @@ -885,9 +911,9 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, last_addr = addrs[dev_nb++]; } - *count = dev_nb; - - return 0; + /* Need manual issue STOP except for Complete condition */ + svc_i3c_master_emit_stop(master); + return ret; } static int svc_i3c_update_ibirules(struct svc_i3c_master *master) @@ -961,11 +987,10 @@ static int svc_i3c_master_do_daa(struct i3c_master_controller *m) spin_lock_irqsave(&master->xferqueue.lock, flags); ret = svc_i3c_master_do_daa_locked(master, addrs, &dev_nb); spin_unlock_irqrestore(&master->xferqueue.lock, flags); - if (ret) { - svc_i3c_master_emit_stop(master); - svc_i3c_master_clear_merrwarn(master); + + svc_i3c_master_clear_merrwarn(master); + if (ret) goto rpm_out; - } /* Register all devices who participated to the core */ for (i = 0; i < dev_nb; i++) { -- 2.34.1 . From: Jeff Layton Date: Tue, 02 Jul 2024 18:44:48 -0400 Subject: [PATCH] filelock: fix potential use-after-free in posix_lock_inode X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240702-filelock-6-10-v1-1-96e766aadc98@kernel.org> To: Chuck Lever , Alexander Aring , Alexander Viro , Christian Brauner , Jan Kara , Matthias Brugger , AngeloGioacchino Del Regno Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, =?utf-8?q?Light_Hsieh_=28=E8=AC=9D=E6=98=8E=E7=87=88=29?= , Jeff Layton Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265832 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Light Hsieh reported a KASAN UAF warning in trace_posix_lock_inode(). The request pointer had been changed earlier to point to a lock entry that was added to the inode's list. However, before the tracepoint could fire, another task raced in and freed that lock. Fix this by moving the tracepoint inside the spinlock, which should ensure that this doesn't happen. Fixes: 74f6f5912693 ("locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock") Link: https://lore.kernel.org/linux-fsdevel/724ffb0a2962e912ea62bb0515deadf39c325112.camel@kernel.org/ Reported-by: Light Hsieh (謝明燈) Signed-off-by: Jeff Layton --- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/locks.c b/fs/locks.c index c360d1992d21..bdd94c32256f 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1367,9 +1367,9 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, locks_wake_up_blocks(&left->c); } out: + trace_posix_lock_inode(inode, request, error); spin_unlock(&ctx->flc_lock); percpu_up_read(&file_rwsem); - trace_posix_lock_inode(inode, request, error); /* * Free any unused locks. */ --- base-commit: e9d22f7a6655941fc8b2b942ed354ec780936b3e change-id: 20240702-filelock-6-10-3fa00ca4fe53 Best regards, -- Jeff Layton . From: Jeff Johnson Date: Tue, 2 Jul 2024 15:47:59 -0700 Subject: [PATCH] math: rational: add missing MODULE_DESCRIPTION() macro X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20240702-md-sh-lib-math-v1-1-93f4ac4fa8fd@quicinc.com> To: Andrew Morton CC: , , "Jeff Johnson" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265834 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kernel-janitors Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With ARCH=sh, make allmodconfig && make W=1 C=1 reports: WARNING: modpost: missing MODULE_DESCRIPTION() in lib/math/rational.o Add the missing invocation of the MODULE_DESCRIPTION() macro. Signed-off-by: Jeff Johnson --- lib/math/rational.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/math/rational.c b/lib/math/rational.c index ec59d426ea63..d2c34e629ee1 100644 --- a/lib/math/rational.c +++ b/lib/math/rational.c @@ -108,4 +108,5 @@ void rational_best_approximation( EXPORT_SYMBOL(rational_best_approximation); +MODULE_DESCRIPTION("Rational fraction support library"); MODULE_LICENSE("GPL v2"); --- base-commit: 1dfe225e9af5bd3399a1dbc6a4df6a6041ff9c23 change-id: 20240702-md-sh-lib-math-13228a37ef88 . From: Lyude Paul To: dri-devel@lists.freedesktop.org Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/panic: Fix uninitialized spinlock acquisition with CONFIG_DRM_PANIC=n Date: Tue, 2 Jul 2024 19:34:50 -0400 Message-ID: <20240702233451.1238645-1-lyude@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265851 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail It turns out that if you happen to have a kernel config where CONFIG_DRM_PANIC is disabled and spinlock debugging is enabled, along with KMS being enabled - we'll end up trying to acquire an uninitialized spin_lock with drm_panic_lock() when we try to do a commit: rvkms rvkms.0: [drm:drm_atomic_commit] committing 0000000068d2ade1 INFO: trying to register non-static key. The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator. CPU: 4 PID: 1347 Comm: modprobe Not tainted 6.10.0-rc1Lyude-Test+ #272 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS edk2-20240524-3.fc40 05/24/2024 Call Trace: dump_stack_lvl+0x77/0xa0 assign_lock_key+0x114/0x120 register_lock_class+0xa8/0x2c0 __lock_acquire+0x7d/0x2bd0 ? __vmap_pages_range_noflush+0x3a8/0x550 ? drm_atomic_helper_swap_state+0x2ad/0x3a0 lock_acquire+0xec/0x290 ? drm_atomic_helper_swap_state+0x2ad/0x3a0 ? lock_release+0xee/0x310 _raw_spin_lock_irqsave+0x4e/0x70 ? drm_atomic_helper_swap_state+0x2ad/0x3a0 drm_atomic_helper_swap_state+0x2ad/0x3a0 drm_atomic_helper_commit+0xb1/0x270 drm_atomic_commit+0xaf/0xe0 ? __pfx___drm_printfn_info+0x10/0x10 drm_client_modeset_commit_atomic+0x1a1/0x250 drm_client_modeset_commit_locked+0x4b/0x180 drm_client_modeset_commit+0x27/0x50 __drm_fb_helper_restore_fbdev_mode_unlocked+0x76/0x90 drm_fb_helper_set_par+0x38/0x40 fbcon_init+0x3c4/0x690 visual_init+0xc0/0x120 do_bind_con_driver+0x409/0x4c0 do_take_over_console+0x233/0x280 do_fb_registered+0x11f/0x210 fbcon_fb_registered+0x2c/0x60 register_framebuffer+0x248/0x2a0 __drm_fb_helper_initial_config_and_unlock+0x58a/0x720 drm_fbdev_generic_client_hotplug+0x6e/0xb0 drm_client_register+0x76/0xc0 _RNvXs_CsHeezP08sTT_5rvkmsNtB4_5RvkmsNtNtCs1cdwasc6FUb_6kernel8platform6Driver5probe+0xed2/0x1060 [rvkms] ? _RNvMs_NtCs1cdwasc6FUb_6kernel8platformINtB4_7AdapterNtCsHeezP08sTT_5rvkms5RvkmsE14probe_callbackBQ_+0x2b/0x70 [rvkms] ? acpi_dev_pm_attach+0x25/0x110 ? platform_probe+0x6a/0xa0 ? really_probe+0x10b/0x400 ? __driver_probe_device+0x7c/0x140 ? driver_probe_device+0x22/0x1b0 ? __device_attach_driver+0x13a/0x1c0 ? __pfx___device_attach_driver+0x10/0x10 ? bus_for_each_drv+0x114/0x170 ? __device_attach+0xd6/0x1b0 ? bus_probe_device+0x9e/0x120 ? device_add+0x288/0x4b0 ? platform_device_add+0x75/0x230 ? platform_device_register_full+0x141/0x180 ? rust_helper_platform_device_register_simple+0x85/0xb0 ? _RNvMs2_NtCs1cdwasc6FUb_6kernel8platformNtB5_6Device13create_simple+0x1d/0x60 ? _RNvXs0_CsHeezP08sTT_5rvkmsNtB5_5RvkmsNtCs1cdwasc6FUb_6kernel6Module4init+0x11e/0x160 [rvkms] ? 0xffffffffc083f000 ? init_module+0x20/0x1000 [rvkms] ? kernfs_xattr_get+0x3e/0x80 ? do_one_initcall+0x148/0x3f0 ? __lock_acquire+0x5ef/0x2bd0 ? __lock_acquire+0x5ef/0x2bd0 ? __lock_acquire+0x5ef/0x2bd0 ? put_cpu_partial+0x51/0x1d0 ? lock_acquire+0xec/0x290 ? put_cpu_partial+0x51/0x1d0 ? lock_release+0xee/0x310 ? put_cpu_partial+0x51/0x1d0 ? fs_reclaim_acquire+0x69/0xf0 ? lock_acquire+0xec/0x290 ? fs_reclaim_acquire+0x69/0xf0 ? kfree+0x22f/0x340 ? lock_release+0xee/0x310 ? kmalloc_trace_noprof+0x48/0x340 ? do_init_module+0x22/0x240 ? kmalloc_trace_noprof+0x155/0x340 ? do_init_module+0x60/0x240 ? __se_sys_finit_module+0x2e0/0x3f0 ? do_syscall_64+0xa4/0x180 ? syscall_exit_to_user_mode+0x108/0x140 ? do_syscall_64+0xb0/0x180 ? vma_end_read+0xd0/0xe0 ? do_user_addr_fault+0x309/0x640 ? clear_bhb_loop+0x45/0xa0 ? clear_bhb_loop+0x45/0xa0 ? clear_bhb_loop+0x45/0xa0 ? entry_SYSCALL_64_after_hwframe+0x76/0x7e Fix this by stubbing these macros out when this config option isn't enabled, along with fixing the unused variable warning that introduces. Signed-off-by: Lyude Paul --- drivers/gpu/drm/drm_atomic_helper.c | 2 +- include/drm/drm_panic.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index fb97b51b38f15..dd5caa8030aa3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3017,7 +3017,7 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state, bool stall) { int i, ret; - unsigned long flags; + unsigned long __maybe_unused flags; struct drm_connector *connector; struct drm_connector_state *old_conn_state, *new_conn_state; struct drm_crtc *crtc; diff --git a/include/drm/drm_panic.h b/include/drm/drm_panic.h index 822dbb1aa9d6f..9cd4239f09286 100644 --- a/include/drm/drm_panic.h +++ b/include/drm/drm_panic.h @@ -52,6 +52,8 @@ struct drm_scanout_buffer { unsigned int pitch[DRM_FORMAT_MAX_PLANES]; }; +#ifdef CONFIG_DRM_PANIC + /** * drm_panic_trylock - try to enter the panic printing critical section * @dev: struct drm_device @@ -137,13 +139,15 @@ struct drm_scanout_buffer { #define drm_panic_unlock(dev, flags) \ raw_spin_unlock_irqrestore(&(dev)->mode_config.panic_lock, flags) -#ifdef CONFIG_DRM_PANIC - void drm_panic_register(struct drm_device *dev); void drm_panic_unregister(struct drm_device *dev); #else +#define drm_panic_trylock(dev, flags) (true) +#define drm_panic_lock(dev, flags) +#define drm_panic_unlock(dev, flags) + static inline void drm_panic_register(struct drm_device *dev) {} static inline void drm_panic_unregister(struct drm_device *dev) {} -- 2.45.2 . From: Wei Yang To: akpm@linux-foundation.org, masahiroy@kernel.org, nathan@kernel.org, nicolas@fjasle.eu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Wei Yang , Mike Rapoport Subject: [PATCH 1/3] mm: use zonelist_zone() to get zone Date: Tue, 2 Jul 2024 23:40:06 +0000 Message-Id: <20240702234008.19101-1-richard.weiyang@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265855 org.kvack.linux-mm:202265 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-kbuild,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Instead of accessing zoneref->zone directly, use zonelist_zone() like other places for consistency. No functional change. Signed-off-by: Wei Yang CC: Mike Rapoport (IBM) --- include/linux/mmzone.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index cb7f265c2b96..a34a74f5b113 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1690,7 +1690,7 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist, zone = zonelist_zone(z)) #define for_next_zone_zonelist_nodemask(zone, z, highidx, nodemask) \ - for (zone = z->zone; \ + for (zone = zonelist_zone(z); \ zone; \ z = next_zones_zonelist(++z, highidx, nodemask), \ zone = zonelist_zone(z)) -- 2.34.1 . Date: Wed, 3 Jul 2024 09:48:57 +1000 From: Stephen Rothwell To: Michael Ellerman , PowerPC , Andrew Morton Cc: Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the powerpc tree with the mm tree Message-ID: <20240703094857.3f489d4f@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Yb+1W8wPbSKE3q_hXMTkwWK"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265865 org.kernel.vger.linux-next:62067 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next,org.ozlabs.lists.linuxppc-dev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/Yb+1W8wPbSKE3q_hXMTkwWK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/mm/nohash/Makefile between commit: 9e49846e4d65 ("powerpc/64e: split out nohash Book3E 64-bit code") from the mm-unstable branch of the mm tree and commit: 732b32daef80 ("powerpc: Remove core support for 40x") from the powerpc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc arch/powerpc/mm/nohash/Makefile index 90e846f0c46c,86d0fe434824..000000000000 --- a/arch/powerpc/mm/nohash/Makefile +++ b/arch/powerpc/mm/nohash/Makefile @@@ -1,8 -1,7 +1,7 @@@ # SPDX-License-Identifier: GPL-2.0 =20 obj-y +=3D mmu_context.o tlb.o tlb_low.o kup.o -obj-$(CONFIG_PPC_BOOK3E_64) +=3D tlb_low_64e.o book3e_pgtable.o +obj-$(CONFIG_PPC_BOOK3E_64) +=3D tlb_64e.o tlb_low_64e.o book3e_pgtable= .o - obj-$(CONFIG_40x) +=3D 40x.o obj-$(CONFIG_44x) +=3D 44x.o obj-$(CONFIG_PPC_8xx) +=3D 8xx.o obj-$(CONFIG_PPC_E500) +=3D e500.o --Sig_/Yb+1W8wPbSKE3q_hXMTkwWK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaEkekACgkQAVBC80lX 0Gzo1AgAkHx90xFZGC5boB/VkLI3RDmEjh54mHf0fdAF7BT96duaaPmrd/k2Yg+I w4U5LiA9CIonPaYfGawwBgBjw+hM4vJ9qK4+iYpOiKutjowsPYODr1wYpOl/P7Xr Suw4Ul6s8qY8/UsKLNpm0AYS0BLJRUidMRIATg07G0f73DUwMpmKIhxfK4OJwod0 8SfWzDQeb23yESIAH2OQ0BXC5vKU6UMNPcS3YNOCw6Ni9zhScsbao6vl+FNjl2X9 6pNVaSwKmxuzM/4WB2W1/l4D6J/JH/+9417huAyOi1Hk3Gxw/QA6qjMI0/TDKJgz IjbNVDw5gyx2ADO4PCf3tYheaXHYYw== =a+Ix -----END PGP SIGNATURE----- --Sig_/Yb+1W8wPbSKE3q_hXMTkwWK-- . From: Pei Li Date: Tue, 02 Jul 2024 17:07:00 -0700 Subject: [PATCH v2] Fix WARNING in __ext4_ioctl X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240702-bug8-v2-1-be675f490db1@gmail.com> To: Theodore Ts'o , Andreas Dilger Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, syzkaller-bugs@googlegroups.com, linux-kernel-mentees@lists.linuxfoundation.org, syzbot+2cab87506a0e7885f4b9@syzkaller.appspotmail.com, Pei Li Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265878 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-kernel-mentees,org.kernel.vger.linux-ext4 Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Specify the size of s_volume_name in strscpy_pad() to avoid buffer overflow. strscpy_pad() by default takes the size of destination string as the size to be read from source string. However, as s_volume_name is only declared as an array of size EXT4_LABEL_MAX, we are reading 1 byte more than expected. Reported-by: syzbot+2cab87506a0e7885f4b9@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=2cab87506a0e7885f4b9 Fixes: 744a56389f73 ("ext4: replace deprecated strncpy with alternatives") Signed-off-by: Pei Li --- strscpy_pad() by default takes the size of destination string as the size to be read from source string. However, as s_volume_name is only declared as an array of size EXT4_LABEL_MAX, we are reading 1 byte more than expected. Specify the size of s_volume_name in strscpy_pad() to avoid buffer overflow. --- Changes in v2: - Add fixes label - Move workaround into commit log - Link to v1: https://lore.kernel.org/r/20240628-bug8-v1-1-417ef53cca33@gmail.com --- fs/ext4/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index dab7acd49709..0c4fb579757a 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -1151,7 +1151,7 @@ static int ext4_ioctl_getlabel(struct ext4_sb_info *sbi, char __user *user_label BUILD_BUG_ON(EXT4_LABEL_MAX >= FSLABEL_MAX); lock_buffer(sbi->s_sbh); - strscpy_pad(label, sbi->s_es->s_volume_name); + strscpy_pad(label, sbi->s_es->s_volume_name, EXT4_LABEL_MAX); unlock_buffer(sbi->s_sbh); if (copy_to_user(user_label, label, sizeof(label))) --- base-commit: 55027e689933ba2e64f3d245fb1ff185b3e7fc81 change-id: 20240628-bug8-7f700a228c4a Best regards, -- Pei Li . From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Jarkko Sakkinen , stable@vger.kernel.org, Stefan Berger , Peter Huewe , Jason Gunthorpe , James Bottomley , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH] tpm: Limit TCG_TPM2_HMAC to known good drivers Date: Wed, 3 Jul 2024 03:30:33 +0300 Message-ID: <20240703003033.19057-1-jarkko@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265886 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.keyrings,org.kernel.vger.linux-integrity,org.kernel.vger.linux-security-module,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail IBM vTPM driver lacks a call to tpm2_sessions_init() and reports: [ 2.987131] tpm tpm0: tpm2_load_context: failed with a TPM error 0x01C4 [ 2.987140] ima: Error Communicating to TPM chip, result: -14 HMAC encryption code also has a risk of null derefence, given that when uninitialized, chip->auth is a null pointer. Limit TCG_TPM2_HMAC to known good drivers until these issues have been properly fixed. Cc: stable@vger.kernel.org # v6.10+ Fixes: d2add27cf2b8 ("tpm: Add NULL primary creation") Reported-by: Stefan Berger Closes: https://lore.kernel.org/linux-integrity/20240617193408.1234365-1-stefanb@linux.ibm.com/ Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index cf0be8a7939d..c310588a5958 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -30,6 +30,7 @@ if TCG_TPM config TCG_TPM2_HMAC bool "Use HMAC and encrypted transactions on the TPM bus" default X86_64 + depends on TCG_CRB || TCG_TIS_CORE select CRYPTO_ECDH select CRYPTO_LIB_AESCFB select CRYPTO_LIB_SHA256 -- 2.45.2 . From: Xiu Jianfeng To: , , , , , CC: , , Subject: [PATCH v5 -next] cgroup/misc: Introduce misc.peak Date: Wed, 3 Jul 2024 00:36:46 +0000 Message-ID: <20240703003646.2762150-1-xiujianfeng@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265890 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kernel.vger.linux-doc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Introduce misc.peak to record the historical maximum usage of the resource, as in some scenarios the value of misc.max could be adjusted based on the peak usage of the resource. Signed-off-by: Xiu Jianfeng --- v5: change the type of watermark to atomic64_t v4: fix the issue of unconditionally updating the watermark v3: fix while (0) v2: use cmpxchg to update the watermark --- Documentation/admin-guide/cgroup-v2.rst | 9 ++++++ include/linux/misc_cgroup.h | 2 ++ kernel/cgroup/misc.c | 41 +++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index ae0fdb6fc618..468a95379009 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -2646,6 +2646,15 @@ Miscellaneous controller provides 3 interface files. If two misc resources (res_ res_a 3 res_b 0 + misc.peak + A read-only flat-keyed file shown in all cgroups. It shows the + historical maximum usage of the resources in the cgroup and its + children.:: + + $ cat misc.peak + res_a 10 + res_b 8 + misc.max A read-write flat-keyed file shown in the non root cgroups. Allowed maximum usage of the resources in the cgroup and its children.:: diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h index e799b1f8d05b..ba02e04b7165 100644 --- a/include/linux/misc_cgroup.h +++ b/include/linux/misc_cgroup.h @@ -30,11 +30,13 @@ struct misc_cg; /** * struct misc_res: Per cgroup per misc type resource * @max: Maximum limit on the resource. + * @watermark: Historical maximum usage of the resource. * @usage: Current usage of the resource. * @events: Number of times, the resource limit exceeded. */ struct misc_res { u64 max; + atomic64_t watermark; atomic64_t usage; atomic64_t events; }; diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c index 79a3717a5803..b92daf5d234d 100644 --- a/kernel/cgroup/misc.c +++ b/kernel/cgroup/misc.c @@ -121,6 +121,19 @@ static void misc_cg_cancel_charge(enum misc_res_type type, struct misc_cg *cg, misc_res_name[type]); } +static void misc_cg_update_watermark(struct misc_res *res, u64 new_usage) +{ + u64 old; + + while (true) { + old = atomic64_read(&res->watermark); + if (new_usage <= old) + break; + if (atomic64_cmpxchg(&res->watermark, old, new_usage) == old) + break; + } +} + /** * misc_cg_try_charge() - Try charging the misc cgroup. * @type: Misc res type to charge. @@ -159,6 +172,7 @@ int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg, u64 amount) ret = -EBUSY; goto err_charge; } + misc_cg_update_watermark(res, new_usage); } return 0; @@ -307,6 +321,29 @@ static int misc_cg_current_show(struct seq_file *sf, void *v) return 0; } +/** + * misc_cg_peak_show() - Show the peak usage of the misc cgroup. + * @sf: Interface file + * @v: Arguments passed + * + * Context: Any context. + * Return: 0 to denote successful print. + */ +static int misc_cg_peak_show(struct seq_file *sf, void *v) +{ + int i; + u64 watermark; + struct misc_cg *cg = css_misc(seq_css(sf)); + + for (i = 0; i < MISC_CG_RES_TYPES; i++) { + watermark = atomic64_read(&cg->res[i].watermark); + if (READ_ONCE(misc_res_capacity[i]) || watermark) + seq_printf(sf, "%s %llu\n", misc_res_name[i], watermark); + } + + return 0; +} + /** * misc_cg_capacity_show() - Show the total capacity of misc res on the host. * @sf: Interface file @@ -357,6 +394,10 @@ static struct cftype misc_cg_files[] = { .name = "current", .seq_show = misc_cg_current_show, }, + { + .name = "peak", + .seq_show = misc_cg_peak_show, + }, { .name = "capacity", .seq_show = misc_cg_capacity_show, -- 2.34.1 . Date: Wed, 3 Jul 2024 10:45:12 +1000 From: Stephen Rothwell To: Bjorn Helgaas , Lorenzo Pieralisi , Krzysztof =?UTF-8?B?V2lsY3p5xYRza2k=?= Cc: Krzysztof =?UTF-8?B?V2lsY3p5xYRza2k=?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: Signed-off-by missing for commit in the pci tree Message-ID: <20240703104512.59dfc264@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/UBJZ0aAiAao6L6NujGGGVi6"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265891 org.kernel.vger.linux-next:62070 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/UBJZ0aAiAao6L6NujGGGVi6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Commit 1ee61ee40d2b ("PCI: endpoint: Introduce 'epc_deinit' event and notify the= EPF drivers") is missing a Signed-off-by from its committer. --=20 Cheers, Stephen Rothwell --Sig_/UBJZ0aAiAao6L6NujGGGVi6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaEnxgACgkQAVBC80lX 0Gx7qgf+IrhWz6bA1tOo11TaXsHbeY99LCsDf63+5KAD8aG6Yu0pdK1ZHeJ6RhOl LHhJH1rAc+pbcbHY+WoXoD3Hxb5eNjb92WbZ9OdXQ8xbGzkVdywmF607qYJg65xg vcMIoj/mcXrahUFyAavT5jj3SGyYSAxBi2OB7w5Bi7jNw3CHeG+5+4gq0BOHVIpJ 4mQrdYobbe6Bqm7PlX050/sw8hhLd4S5XekdoE1KP9DR27iiGP5/Qnj1YAAG0s9f 4DyRyBK9pieOvFhLV4rGV68aimh/DWFeVkyAzqFsU0VoJtiIva1duxFolOSe8B6U 915trFUD91/fVkv6kQjEgNUz/ueYdA== =uEmO -----END PGP SIGNATURE----- --Sig_/UBJZ0aAiAao6L6NujGGGVi6-- . From: Pei Li Date: Tue, 02 Jul 2024 17:48:27 -0700 Subject: [PATCH] io_uring: Fix WARNING in io_cqring_event_overflow X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240702-bug9-v1-1-475cb52d3ee6@gmail.com> To: Jens Axboe , Pavel Begunkov Cc: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, syzkaller-bugs@googlegroups.com, linux-kernel-mentees@lists.linuxfoundation.org, syzbot+f7f9c893345c5c615d34@syzkaller.appspotmail.com, Pei Li Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265893 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-kernel-mentees,org.kernel.vger.io-uring Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Acquire ctx->completion_lock in io_add_aux_cqe(). syzbot reports a warning message in io_cqring_event_overflow(). We were supposed to hold ctx->completion_lock before entering this function, but instead we did not. This patch acquires and releases ctx->completion_lock when entering and exiting io_add_aux_cqe(). Fixes: f33096a3c99c ("io_uring: add io_add_aux_cqe() helper") Reported-by: syzbot+f7f9c893345c5c615d34@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=f7f9c893345c5c615d34 Signed-off-by: Pei Li --- syzbot reports a warning message in io_cqring_event_overflow(). We were supposed to hold ctx->completion_lock before entering this function, but instead we did not. The call stack is as follows: Call Trace: __io_post_aux_cqe io_uring/io_uring.c:816 [inline] io_add_aux_cqe+0x27c/0x320 io_uring/io_uring.c:837 io_msg_tw_complete+0x9d/0x4d0 io_uring/msg_ring.c:78 io_fallback_req_func+0xce/0x1c0 io_uring/io_uring.c:256 process_one_work kernel/workqueue.c:3224 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3305 worker_thread+0x86d/0xd40 kernel/workqueue.c:3383 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:144 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 In io_add_aux_cqe(), we should acquire this lock beforehead. This patch acquires and releases ctx->completion_lock when entering and exiting io_add_aux_cqe(). --- io_uring/io_uring.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 4e2836c9b7bf..0f62332e95ff 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -834,8 +834,10 @@ bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags */ void io_add_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags) { + io_cq_lock(ctx); __io_post_aux_cqe(ctx, user_data, res, cflags); ctx->submit_state.cq_flush = true; + io_cq_unlock_post(ctx); } /* --- base-commit: 74564adfd3521d9e322cfc345fdc132df80f3c79 change-id: 20240702-bug9-ad8a36681e2d Best regards, -- Pei Li . From: Wei Yang To: rppt@kernel.org, akpm@linux-foundation.org, brauner@kernel.org, oleg@redhat.com, mjguzik@gmail.com, tandersen@netflix.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, david@redhat.com, Wei Yang Subject: [PATCH v3 1/3] mm/memblock: introduce a new helper memblock_estimated_nr_pages() Date: Wed, 3 Jul 2024 00:51:49 +0000 Message-Id: <20240703005151.28712-1-richard.weiyang@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265895 org.kvack.linux-mm:202274 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Instead of using raw memblock api, we wrap a new helper for user. Signed-off-by: Wei Yang --- include/linux/memblock.h | 1 + mm/memblock.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 40c62aca36ec..7d1c32b3dc12 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -486,6 +486,7 @@ static inline __init_memblock bool memblock_bottom_up(void) phys_addr_t memblock_phys_mem_size(void); phys_addr_t memblock_reserved_size(void); +unsigned long memblock_estimated_nr_pages(void); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); void memblock_enforce_memory_limit(phys_addr_t memory_limit); diff --git a/mm/memblock.c b/mm/memblock.c index e81fb68f7f88..c1f1aac0459f 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1729,6 +1729,25 @@ phys_addr_t __init_memblock memblock_reserved_size(void) return memblock.reserved.total_size; } +/** + * memblock_estimated_nr_pages - return number of pages from memblock point of + * view + * + * During bootup, system may need number of pages in the whole system to do + * some calculation before all pages are freed to buddy system, especially + * when CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled. + * + * At this point, we can get this information from memblock. Since the system + * state is not settle down and address alignment, the value is an estimation. + * + * Return: + * An estimated number of pages from memblock point of view. + */ +unsigned long __init memblock_estimated_nr_pages(void) +{ + return PHYS_PFN(memblock_phys_mem_size() - memblock_reserved_size()); +} + /* lowest address */ phys_addr_t __init_memblock memblock_start_of_DRAM(void) { -- 2.34.1 . Date: Tue, 2 Jul 2024 18:02:14 -0700 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: <20240703010215.2013266-1-drosen@google.com> Subject: [PATCH 0/1] Fuse Passthrough cache issues From: Daniel Rosenberg To: Miklos Szeredi , Amir Goldstein Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, kernel-team@android.com, Daniel Rosenberg Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265904 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail I've been attempting to recreate Android's usage of Fuse Passthrough with the version now merged in the kernel, and I've run into a couple issues. The first one was pretty straightforward, and I've included a patch, although I'm not convinced that it should be conditional, and it may need to do more to ensure that the cache is up to date. If your fuse daemon is running with writeback cache enabled, writes with passthrough files will cause problems. Fuse will invalidate attributes on write, but because it's in writeback cache mode, it will ignore the requested attributes when the daemon provides them. The kernel is the source of truth in this case, and should update the cached values during the passthrough write. The other issue I ran into is the restriction on opening a file in passthrough and non passthrough modes. In Android, one of our main usecases for passthrough is location metadata redaction. Apps without the location permission get back nulled out data when they read image metadata location. If an app has that permission, it can open the file in passthrough mode, but otherwise the daemon opens the file in normal fuse mode where it can do the redaction. Currently in passthrough, this behavior is explicitly blocked. What's needed to allow this? The page caches can contain different data, but in this case that's a feature, not a bug. They could theoretically be backed by entirely different things, although that would be fairly confusing. I would think the main thing we'd need would be to invalidate areas of the cache when writing in passthrough mode to give the daemon the opportunity to react to what's there now, and also something in the other direction. Might make more sense as something the daemon can opt into. Any thoughts on these issues? And does the proposed fix make sense to you? Daniel Rosenberg (1): fuse: Keep attributes consistent with Passthrough fs/fuse/passthrough.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) base-commit: 73e931504f8e0d42978bfcda37b323dbbd1afc08 -- 2.45.2.803.g4e1b14247a-goog . Date: Tue, 2 Jul 2024 18:53:54 -0700 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: <20240703015354.3370503-1-surenb@google.com> Subject: [PATCH 1/1] mm, slab: move allocation tagging code in the alloc path into a hook From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: vbabka@suse.cz, kent.overstreet@linux.dev, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, roman.gushchin@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, surenb@google.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265918 org.kvack.linux-mm:202283 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Move allocation tagging specific code in the allocation path into alloc_tagging_slab_alloc_hook, similar to how freeing path uses alloc_tagging_slab_free_hook. No functional changes, just code cleanup. Suggested-by: Vlastimil Babka Signed-off-by: Suren Baghdasaryan --- mm/slub.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 4927edec6a8c..99d53190cfcf 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2033,11 +2033,18 @@ prepare_slab_obj_exts_hook(struct kmem_cache *s, gfp_t flags, void *p) return slab_obj_exts(slab) + obj_to_index(s, slab, p); } +#ifdef CONFIG_MEM_ALLOC_PROFILING + +static inline void +alloc_tagging_slab_alloc_hook(struct slabobj_ext *obj_exts, unsigned int size) +{ + alloc_tag_add(&obj_exts->ref, current->alloc_tag, size); +} + static inline void alloc_tagging_slab_free_hook(struct kmem_cache *s, struct slab *slab, void **p, int objects) { -#ifdef CONFIG_MEM_ALLOC_PROFILING struct slabobj_ext *obj_exts; int i; @@ -2053,9 +2060,23 @@ alloc_tagging_slab_free_hook(struct kmem_cache *s, struct slab *slab, void **p, alloc_tag_sub(&obj_exts[off].ref, s->size); } -#endif } +#else /* CONFIG_MEM_ALLOC_PROFILING */ + +static inline void +alloc_tagging_slab_alloc_hook(struct slabobj_ext *obj_exts, unsigned int size) +{ +} + +static inline void +alloc_tagging_slab_free_hook(struct kmem_cache *s, struct slab *slab, void **p, + int objects) +{ +} + +#endif /* CONFIG_MEM_ALLOC_PROFILING*/ + #else /* CONFIG_SLAB_OBJ_EXT */ static int alloc_slab_obj_exts(struct slab *slab, struct kmem_cache *s, @@ -2079,6 +2100,11 @@ prepare_slab_obj_exts_hook(struct kmem_cache *s, gfp_t flags, void *p) return NULL; } +static inline void +alloc_tagging_slab_alloc_hook(struct slabobj_ext *obj_exts, unsigned int size) +{ +} + static inline void alloc_tagging_slab_free_hook(struct kmem_cache *s, struct slab *slab, void **p, int objects) @@ -3944,7 +3970,6 @@ bool slab_post_alloc_hook(struct kmem_cache *s, struct list_lru *lru, kmemleak_alloc_recursive(p[i], s->object_size, 1, s->flags, init_flags); kmsan_slab_alloc(s, p[i], init_flags); -#ifdef CONFIG_MEM_ALLOC_PROFILING if (need_slab_obj_ext()) { struct slabobj_ext *obj_exts; @@ -3955,9 +3980,8 @@ bool slab_post_alloc_hook(struct kmem_cache *s, struct list_lru *lru, * check should be added before alloc_tag_add(). */ if (likely(obj_exts)) - alloc_tag_add(&obj_exts->ref, current->alloc_tag, s->size); + alloc_tagging_slab_alloc_hook(obj_exts, s->size); } -#endif } return memcg_slab_post_alloc_hook(s, lru, flags, size, p); base-commit: e9d22f7a6655941fc8b2b942ed354ec780936b3e -- 2.45.2.803.g4e1b14247a-goog . From: Yan Zhao To: pbonzini@redhat.com, seanjc@google.com Cc: rick.p.edgecombe@intel.com, kai.huang@intel.com, isaku.yamahata@intel.com, dmatlack@google.com, sagis@google.com, erdemaktas@google.com, graf@amazon.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Yan Zhao Subject: [PATCH v2 0/4] Introduce a quirk to control memslot zap behavior Date: Wed, 3 Jul 2024 10:09:20 +0800 Message-ID: <20240703020921.13855-1-yan.y.zhao@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265925 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kvm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Today "zapping only leaf SPTEs with memslot range" ("zap-slot-leafs-only" for short) on moving/deleting a memslot is not done. Instead, KVM opts to invalidate all page tables and generate fresh new ones based on the new memslot layout ("zap-all" for short). This "zap-all" behavior is of low overhead for most use cases, and is adopted primarily due to a bug which caused VM instability when a VM is with Nvidia Geforce GPU assigned (see link in patch 1). However, the "zap-all" behavior is not desired for certain specific scenarios. e.g. - It's not viable for TDX, a) TDX requires root page of private page table remains unaltered throughout the TD life cycle. b) TDX mandates that leaf entries in private page table must be zapped prior to non-leaf entries. c) TDX requires re-accepting of private pages after page dropping. - It's not performant for scenarios involving frequent deletion and re-adding of numerous small memslots. This series therefore introduces the KVM_X86_QUIRK_SLOT_ZAP_ALL quirk, enabling users to control the behavior of memslot zapping when a memslot is moved/deleted for VMs of type KVM_X86_DEFAULT_VM. The quirk is turned on by default for VMs of type KVM_X86_DEFAULT_VM, leading to "zap-all" behavior. Users have the option to turn off the quirk. Doing so will have KVM go "zap-slot-leafs-only" on memslot moving/deleting. KVM will always select "zap-slot-leafs-only" as if the quirk is disabled for non-KVM_X86_DEFAULT_VM VMs for reasons explained in patch 1. This series has been tested with - Normal VMs w/ and w/o device assignment, and kvm selftests - TDX guests. Tested with shared device assignment and guest memory hot-plug/unplug. It can be applied to both kvm/queue and kvm-coco-queue. Patch 1: KVM changes. Patch 2-4: Selftests updates. Verify memslot move/deletion functionality with the quirk enabled/disabled. Changelog: v1 --> v2: - Make KVM behave as if the quirk is always disabled on non-KVM_X86_DEFAULT_VM VMs. (Sean, Rick) - Removed the patch for selftest private_mem_kvm_exits_test, since that selftest is for VM type KVM_X86_SW_PROTECTED_VM. v1: https://lore.kernel.org/all/20240613060708.11761-1-yan.y.zhao@intel.com Yan Zhao (4): KVM: x86/mmu: Introduce a quirk to control memslot zap behavior KVM: selftests: Test slot move/delete with slot zap quirk enabled/disabled KVM: selftests: Allow slot modification stress test with quirk disabled KVM: selftests: Test memslot move in memslot_perf_test with quirk disabled Documentation/virt/kvm/api.rst | 8 ++++ arch/x86/include/asm/kvm_host.h | 3 +- arch/x86/include/uapi/asm/kvm.h | 1 + arch/x86/kvm/mmu/mmu.c | 42 ++++++++++++++++++- .../kvm/memslot_modification_stress_test.c | 19 ++++++++- .../testing/selftests/kvm/memslot_perf_test.c | 12 +++++- .../selftests/kvm/set_memory_region_test.c | 29 +++++++++---- 7 files changed, 101 insertions(+), 13 deletions(-) -- 2.43.2 . From: Dapeng Mi To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jim Mattson , Mingwei Zhang , Xiong Zhang , Zhenyu Wang , Like Xu , Jinrong Liang , Dapeng Mi , Dapeng Mi Subject: [Patch v5 00/18] pmu test bugs fix and improvements Date: Wed, 3 Jul 2024 09:56:54 +0000 Message-Id: <20240703095712.64202-1-dapeng1.mi@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265927 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kvm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Changes: v4 -> v5: * Fix the building errors with configuration options "--arch=i386" or "--enable-efi' introduced by v4 patch "Add IBPB indirect jump asm blob" (Patch 15/18) * Add patch 18/18 to print count details if test case fails All changes pass validation on Intel Sapphire Rapids and Emerald Rapids platforms against latest kvm-x86/next code (0ce958282e66). No tests on AMD platforms since no AMD platform on hand. Any tests on AMD platform are appreciated. History: v4: https://lore.kernel.org/all/20240419035233.3837621-1-dapeng1.mi@linux.intel.com/ v3: https://lore.kernel.org/lkml/20240103031409.2504051-1-dapeng1.mi@linux.intel.com/ v2: https://lore.kernel.org/lkml/20231031092921.2885109-1-dapeng1.mi@linux.intel.com/ v1: https://lore.kernel.org/lkml/20231024075748.1675382-1-dapeng1.mi@linux.intel.com/ Dapeng Mi (17): x86: pmu: Remove blank line and redundant space x86: pmu: Refine fixed_events[] names x86: pmu: Fix the issue that pmu_counter_t.config crosses cache line x86: pmu: Enlarge cnt[] length to 48 in check_counters_many() x86: pmu: Add asserts to warn inconsistent fixed events and counters x86: pmu: Fix cycles event validation failure x86: pmu: Use macro to replace hard-coded branches event index x86: pmu: Use macro to replace hard-coded ref-cycles event index x86: pmu: Use macro to replace hard-coded instructions event index x86: pmu: Enable and disable PMCs in loop() asm blob x86: pmu: Improve instruction and branches events verification x86: pmu: Improve LLC misses event verification x86: pmu: Adjust lower boundary of llc-misses event to 0 for legacy CPUs x86: pmu: Add IBPB indirect jump asm blob x86: pmu: Adjust lower boundary of branch-misses event x86: pmu: Optimize emulated instruction validation x86: pmu: Print measured event count if test fails Xiong Zhang (1): x86: pmu: Remove duplicate code in pmu_init() lib/x86/pmu.c | 5 - x86/pmu.c | 406 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 328 insertions(+), 83 deletions(-) base-commit: d301d0187f5db09531a1c2c7608997cc3b0a5c7d -- 2.40.1 . Return-Path: From: Jinjie Ruan To: , , , , , , CC: Subject: [RFC PATCH] riscv: Enable generic CPU vulnerabilites support Date: Wed, 3 Jul 2024 10:27:32 +0800 Message-ID: <20240703022732.2068316-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79305 org.kernel.vger.linux-kernel:1265950 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Currently x86, ARM and ARM64 support generic CPU vulnerabilites, but RISC-V not, such as: # cd /sys/devices/system/cpu/vulnerabilities/ x86: # cat spec_store_bypass Mitigation: Speculative Store Bypass disabled via prctl and seccomp # cat meltdown Not affected ARM64: # cat spec_store_bypass Mitigation: Speculative Store Bypass disabled via prctl and seccomp # cat meltdown Mitigation: PTI RISC-V: # cat /sys/devices/system/cpu/vulnerabilities # ... No such file or directory As SiFive RISC-V Core IP offerings are not affected by Meltdown and Spectre, it can use the default weak function as below: # cat spec_store_bypass Not affected # cat meltdown Not affected Link: https://www.sifive.cn/blog/sifive-statement-on-meltdown-and-spectre Signed-off-by: Jinjie Ruan --- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 0525ee2d63c7..3b44e7b51436 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -85,6 +85,7 @@ config RISCV select GENERIC_ATOMIC64 if !64BIT select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CPU_DEVICES + select GENERIC_CPU_VULNERABILITIES select GENERIC_EARLY_IOREMAP select GENERIC_ENTRY select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO -- 2.34.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Yang Yang To: Ming Lei , Jens Axboe , Andrew Morton , Yang Yang , Pavel Begunkov , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH v5] sbitmap: fix io hung due to race on sbitmap_word::cleared Date: Wed, 3 Jul 2024 10:28:03 +0800 Message-Id: <20240703022807.642115-1-yang.yang@vivo.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-block:93769 org.kernel.vger.linux-kernel:1265951 Newsgroups: org.kernel.vger.linux-block,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Configuration for sbq: depth=64, wake_batch=6, shift=6, map_nr=1 1. There are 64 requests in progress: map->word = 0xFFFFFFFFFFFFFFFF 2. After all the 64 requests complete, and no more requests come: map->word = 0xFFFFFFFFFFFFFFFF, map->cleared = 0xFFFFFFFFFFFFFFFF 3. Now two tasks try to allocate requests: T1: T2: __blk_mq_get_tag . __sbitmap_queue_get . sbitmap_get . sbitmap_find_bit . sbitmap_find_bit_in_word . __sbitmap_get_word -> nr=-1 __blk_mq_get_tag sbitmap_deferred_clear __sbitmap_queue_get /* map->cleared=0xFFFFFFFFFFFFFFFF */ sbitmap_find_bit if (!READ_ONCE(map->cleared)) sbitmap_find_bit_in_word return false; __sbitmap_get_word -> nr=-1 mask = xchg(&map->cleared, 0) sbitmap_deferred_clear atomic_long_andnot() /* map->cleared=0 */ if (!(map->cleared)) return false; /* * map->cleared is cleared by T1 * T2 fail to acquire the tag */ 4. T2 is the sole tag waiter. When T1 puts the tag, T2 cannot be woken up due to the wake_batch being set at 6. If no more requests come, T1 will wait here indefinitely. This patch achieves two purposes: 1. Check on ->cleared and update on both ->cleared and ->word need to be done atomically, and using spinlock could be the simplest solution. So revert commit 661d4f55a794 ("sbitmap: remove swap_lock"), which may cause potential race. 2. Add extra check in sbitmap_deferred_clear(), to identify whether ->word has free bits. Fixes: 661d4f55a794 ("sbitmap: remove swap_lock") Signed-off-by: Yang Yang --- Changes from v4: - Add some comments according to suggestion Changes from v3: - Add more arguments to sbitmap_deferred_clear(), for those who don't care about the return value, just pass 0 - Consider the situation when using sbitmap_get_shallow() - Consider the situation when ->round_robin is true - Modify commit message Changes from v2: - Modify commit message by suggestion - Add extra check in sbitmap_deferred_clear() by suggestion Changes from v1: - simply revert commit 661d4f55a794 ("sbitmap: remove swap_lock") --- include/linux/sbitmap.h | 5 +++++ lib/sbitmap.c | 46 ++++++++++++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h index d662cf136021..ec0b0e73c906 100644 --- a/include/linux/sbitmap.h +++ b/include/linux/sbitmap.h @@ -36,6 +36,11 @@ struct sbitmap_word { * @cleared: word holding cleared bits */ unsigned long cleared ____cacheline_aligned_in_smp; + + /** + * @swap_lock: Held while swapping word <-> cleared + */ + spinlock_t swap_lock; } ____cacheline_aligned_in_smp; /** diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 1e453f825c05..22d6e86ba87f 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -60,12 +60,35 @@ static inline void update_alloc_hint_after_get(struct sbitmap *sb, /* * See if we have deferred clears that we can batch move */ -static inline bool sbitmap_deferred_clear(struct sbitmap_word *map) +static inline bool sbitmap_deferred_clear(struct sbitmap_word *map, + unsigned int depth, unsigned int alloc_hint, bool wrap) { - unsigned long mask; + unsigned long mask, flags, word_mask; + bool ret = false; - if (!READ_ONCE(map->cleared)) - return false; + spin_lock_irqsave(&map->swap_lock, flags); + + if (!map->cleared) { + if (depth > 0) { + word_mask = (~0UL) >> (BITS_PER_LONG - depth); + /* + * The current behavior is to always retry after moving + * ->cleared to word, and we change it to retry in case + * of any free bits. To avoid dead loop, we need to take + * wrap & alloc_hint into account. Without this, a soft + * lockup was detected in our test environment. + */ + if (!wrap && alloc_hint) + word_mask &= ~((1UL << alloc_hint) - 1); + + if ((READ_ONCE(map->word) & word_mask) == word_mask) + ret = false; + else + ret = true; + } + + goto out_unlock; + } /* * First get a stable cleared mask, setting the old mask to 0. @@ -77,7 +100,10 @@ static inline bool sbitmap_deferred_clear(struct sbitmap_word *map) */ atomic_long_andnot(mask, (atomic_long_t *)&map->word); BUILD_BUG_ON(sizeof(atomic_long_t) != sizeof(map->word)); - return true; + ret = true; +out_unlock: + spin_unlock_irqrestore(&map->swap_lock, flags); + return ret; } int sbitmap_init_node(struct sbitmap *sb, unsigned int depth, int shift, @@ -85,6 +111,7 @@ int sbitmap_init_node(struct sbitmap *sb, unsigned int depth, int shift, bool alloc_hint) { unsigned int bits_per_word; + int i; if (shift < 0) shift = sbitmap_calculate_shift(depth); @@ -116,6 +143,9 @@ int sbitmap_init_node(struct sbitmap *sb, unsigned int depth, int shift, return -ENOMEM; } + for (i = 0; i < sb->map_nr; i++) + spin_lock_init(&sb->map[i].swap_lock); + return 0; } EXPORT_SYMBOL_GPL(sbitmap_init_node); @@ -126,7 +156,7 @@ void sbitmap_resize(struct sbitmap *sb, unsigned int depth) unsigned int i; for (i = 0; i < sb->map_nr; i++) - sbitmap_deferred_clear(&sb->map[i]); + sbitmap_deferred_clear(&sb->map[i], 0, 0, 0); sb->depth = depth; sb->map_nr = DIV_ROUND_UP(sb->depth, bits_per_word); @@ -179,7 +209,7 @@ static int sbitmap_find_bit_in_word(struct sbitmap_word *map, alloc_hint, wrap); if (nr != -1) break; - if (!sbitmap_deferred_clear(map)) + if (!sbitmap_deferred_clear(map, depth, alloc_hint, wrap)) break; } while (1); @@ -496,7 +526,7 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags, unsigned int map_depth = __map_depth(sb, index); unsigned long val; - sbitmap_deferred_clear(map); + sbitmap_deferred_clear(map, 0, 0, 0); val = READ_ONCE(map->word); if (val == (1UL << (map_depth - 1)) - 1) goto next; -- 2.34.1 . Return-Path: From: Inochi Amaoto To: Jean Delvare , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen Wang , Inochi Amaoto , Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH v6 0/2] riscv: sophgo: Add SG2042 external hardware monitor support Date: Wed, 3 Jul 2024 10:29:58 +0800 Message-ID: MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79306 org.kernel.vger.linux-kernel:1265955 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-doc,org.kernel.vger.linux-hwmon,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add support for the onboard hardware monitor for SG2042. Related SBI patch: https://lists.infradead.org/pipermail/opensbi/2024-April/006849.html Changed from v5: 1. rename driver name to sgmcu as it will support more sophgo chip. 2. move some attr to debugfs. 3. add standard crit_hyst support 4. add documentation Changed from v4: 1. use fix patch for binding ref. 2. use unevaluatedProperties instead of additionalProperties for binding Changed from v3: 1. add thermal-sensor check. 2. change node type from syscon to hwmon Changed from v2: 1. fix bindings id path. Changed from v1: 1. Move patch from soc to hwmon. 2. Fix typo. Inochi Amaoto (2): dt-bindings: hwmon: Add Sophgo SG2042 external hardware monitor support drivers: hwmon: sophgo: Add SG2042 external hardware monitor support .../hwmon/sophgo,sg2042-hwmon-mcu.yaml | 43 ++ Documentation/hwmon/index.rst | 1 + Documentation/hwmon/sgmcu.rst | 44 ++ drivers/hwmon/Kconfig | 11 + drivers/hwmon/Makefile | 1 + drivers/hwmon/sgmcu.c | 585 ++++++++++++++++++ 6 files changed, 685 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/sophgo,sg2042-hwmon-mcu.yaml create mode 100644 Documentation/hwmon/sgmcu.rst create mode 100644 drivers/hwmon/sgmcu.c -- 2.45.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Canfeng Guo To: paul@paul-moore.com Cc: stephen.smalley.work@gmail.com, omosnace@redhat.com, selinux@vger.kernel.org, linux-kernel@vger.kernel.org, Canfeng Guo Subject: [PATCH] selinux: Streamline type determination in security_compute_sid Date: Wed, 3 Jul 2024 10:56:05 +0800 Message-Id: <20240703025605.63628-1-guocanfeng@uniontech.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265972 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.selinux Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Simplifies the logic for determining the security context type in security_compute_sid, enhancing readability and efficiency. Consolidates default type assignment logic next to type transition checks, removing redundancy and improving code flow. Signed-off-by: Canfeng Guo --- v2: Modify the format to follow the generally accepted style for multi-line comments in the Linux kernel. --- security/selinux/ss/services.c | 36 ++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index e33e55384b75..a9830fbfc5c6 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1804,22 +1804,9 @@ static int security_compute_sid(u32 ssid, newcontext.role = OBJECT_R_VAL; } - /* Set the type to default values. */ - if (cladatum && cladatum->default_type == DEFAULT_SOURCE) { - newcontext.type = scontext->type; - } else if (cladatum && cladatum->default_type == DEFAULT_TARGET) { - newcontext.type = tcontext->type; - } else { - if ((tclass == policydb->process_class) || sock) { - /* Use the type of process. */ - newcontext.type = scontext->type; - } else { - /* Use the type of the related object. */ - newcontext.type = tcontext->type; - } - } - - /* Look for a type transition/member/change rule. */ + /* Set the type. + * Look for a type transition/member/change rule. + */ avkey.source_type = scontext->type; avkey.target_type = tcontext->type; avkey.target_class = tclass; @@ -1837,9 +1824,24 @@ static int security_compute_sid(u32 ssid, } } + /* If a permanent rule is found, use the type from + * the type transition/member/change rule. Otherwise, + * set the type to its default values. + */ if (avnode) { - /* Use the type from the type transition/member/change rule. */ newcontext.type = avnode->datum.u.data; + } else if (cladatum && cladatum->default_type == DEFAULT_SOURCE) { + newcontext.type = scontext->type; + } else if (cladatum && cladatum->default_type == DEFAULT_TARGET) { + newcontext.type = tcontext->type; + } else { + if ((tclass == policydb->process_class) || sock) { + /* Use the type of process. */ + newcontext.type = scontext->type; + } else { + /* Use the type of the related object. */ + newcontext.type = tcontext->type; + } } /* if we have a objname this is a file trans check so check those rules */ -- 2.20.1 . From: "Peng Fan (OSS)" To: sudeep.holla@arm.com, cristian.marussi@arm.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, arm-scmi@vger.kernel.org, devicetree@vger.kernel.org, Peng Fan Subject: [PATCH V2 1/2] dt-bindings: firmware: arm,scmi: introduce property mbox-rx-timeout-ms Date: Wed, 3 Jul 2024 11:17:14 +0800 Message-Id: <20240703031715.379815-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265975 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.arm-scmi,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Peng Fan System Controller Management Interface(SCMI) firmwares might have different designs by SCMI firmware developers. So the maximum receive channel timeout value might also varies in the various designs. So introduce property mbox-rx-timeout-ms to let each platform could set its own timeout value in device tree. Signed-off-by: Peng Fan --- V2: Drop defaults, update description. Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml index ebf384e76df1..dcac0b36c76f 100644 --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml @@ -121,6 +121,12 @@ properties: atomic mode of operation, even if requested. default: 0 + max-rx-timeout-ms: + description: + An optional time value, expressed in milliseconds, representing the + mailbox maximum timeout value for receive channel. The value should + be a non-zero value if set. + arm,smc-id: $ref: /schemas/types.yaml#/definitions/uint32 description: -- 2.37.1 . Date: Wed, 3 Jul 2024 13:18:20 +1000 From: Stephen Rothwell To: "Paul E. McKenney" , Petr Mladek Cc: John Ogness , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the paulmck tree with the printk tree Message-ID: <20240703131820.02eb8021@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HTkGw2i4JoMI8c1Amolbd9g"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265983 org.kernel.vger.linux-next:62075 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/HTkGw2i4JoMI8c1Amolbd9g Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the paulmck tree got a conflict in: kernel/rcu/tree_exp.h between commit: 9a30ceb4d93e ("rcu: Mark emergency sections in rcu stalls") from the printk tree and commit: c19a6725b019 ("rcu: Extract synchronize_rcu_expedited_stall() from synchr= onize_rcu_expedited_wait()") from the paulmck tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc kernel/rcu/tree_exp.h index be2d251e84f8,d4be644afb50..000000000000 --- a/kernel/rcu/tree_exp.h +++ b/kernel/rcu/tree_exp.h @@@ -543,6 -542,69 +543,70 @@@ static bool synchronize_rcu_expedited_w return false; } =20 + /* + * Print out an expedited RCU CPU stall warning message. + */ + static void synchronize_rcu_expedited_stall(unsigned long jiffies_start, = unsigned long j) + { + int cpu; + unsigned long mask; + int ndetected; + struct rcu_node *rnp; + struct rcu_node *rnp_root =3D rcu_get_root(); +=20 + if (READ_ONCE(csd_lock_suppress_rcu_stall) && csd_lock_is_stuck()) { + pr_err("INFO: %s detected expedited stalls, but suppressed full report = due to a stuck CSD-lock.\n", rcu_state.name); + return; + } + pr_err("INFO: %s detected expedited stalls on CPUs/tasks: {", rcu_state.= name); + ndetected =3D 0; + rcu_for_each_leaf_node(rnp) { + ndetected +=3D rcu_print_task_exp_stall(rnp); + for_each_leaf_node_possible_cpu(rnp, cpu) { + struct rcu_data *rdp; +=20 + mask =3D leaf_node_cpu_bit(rnp, cpu); + if (!(READ_ONCE(rnp->expmask) & mask)) + continue; + ndetected++; + rdp =3D per_cpu_ptr(&rcu_data, cpu); + pr_cont(" %d-%c%c%c%c", cpu, + "O."[!!cpu_online(cpu)], + "o."[!!(rdp->grpmask & rnp->expmaskinit)], + "N."[!!(rdp->grpmask & rnp->expmaskinitnext)], + "D."[!!data_race(rdp->cpu_no_qs.b.exp)]); + } + } + pr_cont(" } %lu jiffies s: %lu root: %#lx/%c\n", + j - jiffies_start, rcu_state.expedited_sequence, data_race(rnp_root->ex= pmask), + ".T"[!!data_race(rnp_root->exp_tasks)]); + if (ndetected) { + pr_err("blocking rcu_node structures (internal RCU debug):"); + rcu_for_each_node_breadth_first(rnp) { + if (rnp =3D=3D rnp_root) + continue; /* printed unconditionally */ + if (sync_rcu_exp_done_unlocked(rnp)) + continue; + pr_cont(" l=3D%u:%d-%d:%#lx/%c", + rnp->level, rnp->grplo, rnp->grphi, data_race(rnp->expmask), + ".T"[!!data_race(rnp->exp_tasks)]); + } + pr_cont("\n"); + } + rcu_for_each_leaf_node(rnp) { + for_each_leaf_node_possible_cpu(rnp, cpu) { + mask =3D leaf_node_cpu_bit(rnp, cpu); + if (!(READ_ONCE(rnp->expmask) & mask)) + continue; + preempt_disable(); // For smp_processor_id() in dump_cpu_task(). + dump_cpu_task(cpu); + preempt_enable(); ++ nbcon_cpu_emergency_flush(); + } + rcu_exp_print_detail_task_stall_rnp(rnp); + } + } +=20 /* * Wait for the expedited grace period to elapse, issuing any needed * RCU CPU stall warnings along the way. @@@ -597,60 -654,8 +659,11 @@@ static void synchronize_rcu_expedited_w j =3D jiffies; rcu_stall_notifier_call_chain(RCU_STALL_NOTIFY_EXP, (void *)(j - jiffie= s_start)); trace_rcu_stall_warning(rcu_state.name, TPS("ExpeditedStall")); - pr_err("INFO: %s detected expedited stalls on CPUs/tasks: {", - rcu_state.name); - ndetected =3D 0; - rcu_for_each_leaf_node(rnp) { - ndetected +=3D rcu_print_task_exp_stall(rnp); - for_each_leaf_node_possible_cpu(rnp, cpu) { - struct rcu_data *rdp; -=20 - mask =3D leaf_node_cpu_bit(rnp, cpu); - if (!(READ_ONCE(rnp->expmask) & mask)) - continue; - ndetected++; - rdp =3D per_cpu_ptr(&rcu_data, cpu); - pr_cont(" %d-%c%c%c%c", cpu, - "O."[!!cpu_online(cpu)], - "o."[!!(rdp->grpmask & rnp->expmaskinit)], - "N."[!!(rdp->grpmask & rnp->expmaskinitnext)], - "D."[!!data_race(rdp->cpu_no_qs.b.exp)]); - } - } - pr_cont(" } %lu jiffies s: %lu root: %#lx/%c\n", - j - jiffies_start, rcu_state.expedited_sequence, - data_race(rnp_root->expmask), - ".T"[!!data_race(rnp_root->exp_tasks)]); - if (ndetected) { - pr_err("blocking rcu_node structures (internal RCU debug):"); - rcu_for_each_node_breadth_first(rnp) { - if (rnp =3D=3D rnp_root) - continue; /* printed unconditionally */ - if (sync_rcu_exp_done_unlocked(rnp)) - continue; - pr_cont(" l=3D%u:%d-%d:%#lx/%c", - rnp->level, rnp->grplo, rnp->grphi, - data_race(rnp->expmask), - ".T"[!!data_race(rnp->exp_tasks)]); - } - pr_cont("\n"); - } - rcu_for_each_leaf_node(rnp) { - for_each_leaf_node_possible_cpu(rnp, cpu) { - mask =3D leaf_node_cpu_bit(rnp, cpu); - if (!(READ_ONCE(rnp->expmask) & mask)) - continue; - preempt_disable(); // For smp_processor_id() in dump_cpu_task(). - dump_cpu_task(cpu); - preempt_enable(); - nbcon_cpu_emergency_flush(); - } - rcu_exp_print_detail_task_stall_rnp(rnp); - } + synchronize_rcu_expedited_stall(jiffies_start, j); jiffies_stall =3D 3 * rcu_exp_jiffies_till_stall_check() + 3; + + nbcon_cpu_emergency_exit(); + panic_on_rcu_stall(); } } --Sig_/HTkGw2i4JoMI8c1Amolbd9g Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaEwvwACgkQAVBC80lX 0GwGDAf/W2tu4iHW+DEnwI3i9dD9QWYcorw0K0d5FGY1lh8/fqkEMk+GCjxYrDDg Lr5gX178YoDYszRerzCLSCsCFbXIaPrLuS5owevS21qqrzfyFcEK+sT6P9NL/mhu lDtzYkoWRAWEhPjDSzEk3PK8FYiPAFXRk16MsfhwI+wdRS7M6WkhnHdiCxP9lBj1 kJxEzQbpAOix6yv/c9P97YYMZJ6cKHt+eg2ySIPqIejFGPhSLBhW+3KPvMzY6kLu MIEyoS9LHTwFgJwez4DTLb68x9+C59KsSfxbcCqB0rGEVRd5Hb49xIgwBaRSK9W/ ecPdCTYJyXTMuX3yCflVQWYvwks7rg== =OMag -----END PGP SIGNATURE----- --Sig_/HTkGw2i4JoMI8c1Amolbd9g-- . Date: Wed, 3 Jul 2024 11:33:53 +0800 X-MD-Sfrom: tiozhang@didiglobal.com X-MD-SrcIP: 10.79.65.12 From: Tio Zhang To: , CC: , , , , , , , , , , , , , Subject: [PATCH 1/1] tracing/sched: sched_switch: place prev_comm and next_comm in right order Message-ID: <20240703033353.GA2833@didi-ThinkCentre-M930t-N000> Mail-Followup-To: rostedt@goodmis.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, vineethr@linux.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, mingo@kernel.org, mgorman@techsingularity.net, peterz@infradead.org, qyousef@layalina.io, vincent.guittot@linaro.org, elver@google.com, zyhtheonly@gmail.com, zyhtheonly@yeah.net X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1265988 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Switch the order of prev_comm and next_comm in sched_switch's code to align with its printing order. Signed-off-by: Tio Zhang Reviewed-by: Madadi Vineeth Reddy --- include/trace/events/sched.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index dbb01b4b7451..a4bd4330db4c 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -239,11 +239,11 @@ TRACE_EVENT(sched_switch, ), TP_fast_assign( - memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN); + memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN); __entry->prev_pid = prev->pid; __entry->prev_prio = prev->prio; __entry->prev_state = __trace_sched_switch_state(preempt, prev_state, prev); - memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN); + memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN); __entry->next_pid = next->pid; __entry->next_prio = next->prio; /* XXX SCHED_DEADLINE */ -- 2.17.1 . From: Jason Chen To: Bjorn Andersson , Mathieu Poirier , Matthias Brugger , AngeloGioacchino Del Regno CC: , , , , , Jason Chen Subject: [PATCH] remoteproc: mediatek: Increase MT8188/MT8195 SCP core0 DRAM size Date: Wed, 3 Jul 2024 11:44:09 +0800 Message-ID: <20240703034409.698-1-Jason-ch.Chen@mediatek.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266006 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-remoteproc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The current DRAM size is insufficient for the HEVC feature, which requires more memory for proper functionality. This change ensures the feature has the necessary resources. Signed-off-by: Jason Chen --- drivers/remoteproc/mtk_scp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index b17757900cd7..e744c07507ee 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -1388,7 +1388,7 @@ static const struct mtk_scp_sizes_data default_scp_sizes = { }; static const struct mtk_scp_sizes_data mt8188_scp_sizes = { - .max_dram_size = 0x500000, + .max_dram_size = 0x800000, .ipi_share_buffer_size = 600, }; @@ -1397,6 +1397,11 @@ static const struct mtk_scp_sizes_data mt8188_scp_c1_sizes = { .ipi_share_buffer_size = 600, }; +static const struct mtk_scp_sizes_data mt8195_scp_sizes = { + .max_dram_size = 0x800000, + .ipi_share_buffer_size = 288, +}; + static const struct mtk_scp_of_data mt8183_of_data = { .scp_clk_get = mt8183_scp_clk_get, .scp_before_load = mt8183_scp_before_load, @@ -1474,7 +1479,7 @@ static const struct mtk_scp_of_data mt8195_of_data = { .scp_da_to_va = mt8192_scp_da_to_va, .host_to_scp_reg = MT8192_GIPC_IN_SET, .host_to_scp_int_bit = MT8192_HOST_IPC_INT_BIT, - .scp_sizes = &default_scp_sizes, + .scp_sizes = &mt8195_scp_sizes, }; static const struct mtk_scp_of_data mt8195_of_data_c1 = { -- 2.34.1 . From: alexs@kernel.org To: Vitaly Wool , Miaohe Lin , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, minchan@kernel.org, willy@infradead.org, senozhatsky@chromium.org, david@redhat.com, 42.hyeyoo@gmail.com, Yosry Ahmed , nphamcs@gmail.com Cc: Alex Shi Subject: [PATCH v2 00/20] mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool Date: Wed, 3 Jul 2024 12:05:50 +0800 Message-ID: <20240703040613.681396-1-alexs@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266008 org.kvack.linux-mm:202295 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Alex Shi According to Metthew's plan, the page descriptor will be replace by a 8 bytes mem_desc on destination purpose. https://lore.kernel.org/lkml/YvV1KTyzZ+Jrtj9x@casper.infradead.org/ Here is a implement on zsmalloc to replace page descriptor by 'zpdesc', which is still overlay on struct page now. but it's a step move forward above destination. To name the struct zpdesc instead of zsdesc, since there are still 3 zpools under zswap: zbud, z3fold, zsmalloc for now(z3fold maybe removed soon), and we could easyly extend it to other zswap.zpool in needs. For all zswap.zpools, they are all using single page since often used under memory pressure. So the conversion via folio series helper is better than page's for compound_head check saving. For now, all zpools are using some page struct members, like page.flags for PG_private/PG_locked. and list_head lru, page.mapping for page migration. This patachset does not increase the descriptor size nor introduce any functional changes, and it could save about 123Kbytes zsmalloc.o size. Thanks Alex --- v1->v2: - Take Yosry and Yoo's suggestion to add more members in zpdesc, - Rebase on latest mm-unstable commit 31334cf98dbd --- Alex Shi (8): mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool mm/zsmalloc: use zpdesc in trylock_zspage/lock_zspage mm/zsmalloc: convert create_page_chain() and its users to use zpdesc mm/zsmalloc: rename reset_page to reset_zpdesc and use zpdesc in it mm/zsmalloc: convert SetZsPageMovable and remove unused funcs mm/zsmalloc: introduce __zpdesc_clear_movable mm/zsmalloc: introduce __zpdesc_clear_zsmalloc mm/zsmalloc: introduce __zpdesc_set_zsmalloc() Hyeonggon Yoo (12): mm/zsmalloc: convert __zs_map_object/__zs_unmap_object to use zpdesc mm/zsmalloc: add and use pfn/zpdesc seeking funcs mm/zsmalloc: convert obj_malloc() to use zpdesc mm/zsmalloc: convert obj_allocated() and related helpers to use zpdesc mm/zsmalloc: convert init_zspage() to use zpdesc mm/zsmalloc: convert obj_to_page() and zs_free() to use zpdesc mm/zsmalloc: add zpdesc_is_isolated/zpdesc_zone helper for zs_page_migrate mm/zsmalloc: convert __free_zspage() to use zdsesc mm/zsmalloc: convert location_to_obj() to take zpdesc mm/zsmalloc: convert migrate_zspage() to use zpdesc mm/zsmalloc: convert get_zspage() to take zpdesc mm/zsmalloc: convert get/set_first_obj_offset() to take zpdesc mm/zpdesc.h | 143 ++++++++++++++++ mm/zsmalloc.c | 456 +++++++++++++++++++++++++++----------------------- 2 files changed, 393 insertions(+), 206 deletions(-) create mode 100644 mm/zpdesc.h -- 2.43.0 . From: Andrii Nakryiko To: linux-trace-kernel@vger.kernel.org, peterz@infradead.org, rostedt@goodmis.org, mhiramat@kernel.org Cc: x86@kernel.org, mingo@redhat.com, tglx@linutronix.de, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, rihams@fb.com, linux-perf-users@vger.kernel.org, Andrii Nakryiko Subject: [PATCH v3] perf,x86: avoid missing caller address in stack traces captured in uprobe Date: Tue, 2 Jul 2024 21:02:03 -0700 Message-ID: <20240703040203.3368505-1-andrii@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266025 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf,org.kernel.vger.linux-perf-users,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail When tracing user functions with uprobe functionality, it's common to install the probe (e.g., a BPF program) at the first instruction of the function. This is often going to be `push %rbp` instruction in function preamble, which means that within that function frame pointer hasn't been established yet. This leads to consistently missing an actual caller of the traced function, because perf_callchain_user() only records current IP (capturing traced function) and then following frame pointer chain (which would be caller's frame, containing the address of caller's caller). So when we have target_1 -> target_2 -> target_3 call chain and we are tracing an entry to target_3, captured stack trace will report target_1 -> target_3 call chain, which is wrong and confusing. This patch proposes a x86-64-specific heuristic to detect `push %rbp` (`push %ebp` on 32-bit architecture) instruction being traced. Given entire kernel implementation of user space stack trace capturing works under assumption that user space code was compiled with frame pointer register (%rbp/%ebp) preservation, it seems pretty reasonable to use this instruction as a strong indicator that this is the entry to the function. In that case, return address is still pointed to by %rsp/%esp, so we fetch it and add to stack trace before proceeding to unwind the rest using frame pointer-based logic. We also check for `endbr64` (for 64-bit modes) as another common pattern for function entry, as suggested by Josh Poimboeuf. Even if we get this wrong sometimes for uprobes attached not at the function entry, it's OK because stack trace will still be overall meaningful, just with one extra bogus entry. If we don't detect this, we end up with guaranteed to be missing caller function entry in the stack trace, which is worse overall. Signed-off-by: Andrii Nakryiko --- v2->v3: - added endr64 detection and extracted heuristics into a function (Josh); v1->v2: - use native unsigned long for ret_addr (Peter); - add same logic for compat logic in perf_callchain_user32 (Peter). arch/x86/events/core.c | 56 +++++++++++++++++++++++++++++++++++++++++ include/linux/uprobes.h | 2 ++ kernel/events/uprobes.c | 2 ++ 3 files changed, 60 insertions(+) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 5b0dd07b1ef1..2174a9d2173e 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2813,6 +2813,31 @@ static unsigned long get_segment_base(unsigned int segment) return get_desc_base(desc); } +#ifdef CONFIG_UPROBES +/* + * Heuristic-based check if uprobe is installed at the function entry. + * + * Under assumption of user code being compiled with frame pointers, + * `push %rbp/%ebp` is a good indicator that we indeed are. + * + * Similarly, `endbr64` (assuming 64-bit mode) is also a common pattern. + * If we get this wrong, captured stack trace might have one extra bogus + * entry, but the rest of stack trace will still be meaningful. + */ +static bool is_uprobe_at_func_entry(struct pt_regs *regs, struct arch_uprobe *auprobe) +{ + if (!auprobe) + return false; + /* push %rbp/%ebp */ + if (auprobe->insn[0] == 0x55) + return true; + /* endbr64 (64-bit only) */ + if (user_64bit_mode(regs) && *(u32 *)auprobe->insn == 0xfa1e0ff3) + return true; + return false; +} +#endif + #ifdef CONFIG_IA32_EMULATION #include @@ -2833,6 +2858,18 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent fp = compat_ptr(ss_base + regs->bp); pagefault_disable(); + +#ifdef CONFIG_UPROBES + /* see perf_callchain_user() below for why we do this */ + if (current->utask) { + u32 ret_addr; + + if (is_uprobe_at_func_entry(regs, current->utask->auprobe) && + !__get_user(ret_addr, (const u32 __user *)regs->sp)) + perf_callchain_store(entry, ret_addr); + } +#endif + while (entry->nr < entry->max_stack) { if (!valid_user_frame(fp, sizeof(frame))) break; @@ -2884,6 +2921,25 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs return; pagefault_disable(); + +#ifdef CONFIG_UPROBES + /* + * If we are called from uprobe handler, and we are indeed at the very + * entry to user function (which is normally a `push %rbp` instruction, + * under assumption of application being compiled with frame pointers), + * we should read return address from *regs->sp before proceeding + * to follow frame pointers, otherwise we'll skip immediate caller + * as %rbp is not yet setup. + */ + if (current->utask) { + unsigned long ret_addr; + + if (is_uprobe_at_func_entry(regs, current->utask->auprobe) && + !__get_user(ret_addr, (const unsigned long __user *)regs->sp)) + perf_callchain_store(entry, ret_addr); + } +#endif + while (entry->nr < entry->max_stack) { if (!valid_user_frame(fp, sizeof(frame))) break; diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index b503fafb7fb3..a270a5892ab4 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -76,6 +76,8 @@ struct uprobe_task { struct uprobe *active_uprobe; unsigned long xol_vaddr; + struct arch_uprobe *auprobe; + struct return_instance *return_instances; unsigned int depth; }; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 99be2adedbc0..6e22e4d80f1e 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -2082,6 +2082,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs) bool need_prep = false; /* prepare return uprobe, when needed */ down_read(&uprobe->register_rwsem); + current->utask->auprobe = &uprobe->arch; for (uc = uprobe->consumers; uc; uc = uc->next) { int rc = 0; @@ -2096,6 +2097,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs) remove &= rc; } + current->utask->auprobe = NULL; if (need_prep && !remove) prepare_uretprobe(uprobe, regs); /* put bp at return */ -- 2.43.0 . From: Clark Williams Subject: [ANNOUNCE] 6.1.96-rt35 Date: Wed, 03 Jul 2024 04:17:29 -0000 Message-ID: <171998024922.171686.11618948234066301156@demetrius.lan> To: LKML ,linux-rt-users ,Steven Rostedt ,Thomas Gleixner ,Carsten Emde ,John Kacur ,Sebastian Andrzej Siewior ,Daniel Wagner ,Tom Zanussi ,Clark Williams ,Pavel Machek ,Joseph Salisbury X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266031 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-rt-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello RT-list! I'm pleased to announce the 6.1.96-rt35 stable release. You can get this release via the git tree at: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git branch: v6.1-rt Head SHA1: 07db47850dd81cb7b07677019c1f9822de12a67b Or to build 6.1.96-rt35 directly, the following patches should be applied: https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.96.xz https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.96-rt35.patch.xz Enjoy! Clark . Date: Wed, 3 Jul 2024 14:19:32 +1000 From: Stephen Rothwell To: Kishon Vijay Abraham I , Vinod Koul , Krzysztof Kozlowski Cc: =?UTF-8?B?QW5kcsOp?= Draszik , Krzysztof Kozlowski , Linux Kernel Mailing List , Linux Next Mailing List , Peter Griffin Subject: linux-next: manual merge of the phy-next tree with the samsung-krzk tree Message-ID: <20240703141932.47e51748@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/CoM4KYEr_Pu0_WKx0t6EDH6"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266032 org.kernel.vger.linux-next:62076 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/CoM4KYEr_Pu0_WKx0t6EDH6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the phy-next tree got a conflict in: include/linux/soc/samsung/exynos-regs-pmu.h between commit: 85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non at= omic registers") from the samsung-krzk tree and commit: 32267c29bc7d ("phy: exynos5-usbdrd: support Exynos USBDRD 3.1 combo phy (= HS & SS)") from the phy-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc include/linux/soc/samsung/exynos-regs-pmu.h index f411c176536d,6765160eaab2..000000000000 --- a/include/linux/soc/samsung/exynos-regs-pmu.h +++ b/include/linux/soc/samsung/exynos-regs-pmu.h @@@ -657,8 -657,8 +657,12 @@@ #define EXYNOS5433_PAD_RETENTION_UFS_OPTION (0x3268) #define EXYNOS5433_PAD_RETENTION_FSYSGENIO_OPTION (0x32A8) =20 +/* For Tensor GS101 */ +#define GS101_SYSIP_DAT0 (0x810) +#define GS101_SYSTEM_CONFIGURATION (0x3A00) + + /* For GS101 */ + #define GS101_PHY_CTRL_USB20 0x3eb0 + #define GS101_PHY_CTRL_USBDP 0x3eb4 +=20 #endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */ --Sig_/CoM4KYEr_Pu0_WKx0t6EDH6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaE0VQACgkQAVBC80lX 0GzMYwf/VD6ZV3ECZh7o9YP6+Hu61hp0IaCXPlCkT8Vw8mgDrgzEbOYMMocfgZJM CgoIR/40XwUGNog3QBtHkNXxirbEK7a4GTtKtrFQAad7ZmWKE8A/g599vv2Eb0ae bdHVpeBurN0OkpkmJWI7AZDYEAN/5CHqElV+oljdiN6Lytn7tcmjAGYxxjNUiR6h sf75V+FyLx74OA8Z9VSUIS7O7mEcw2cdHZIOfTDiuWiJNjv5yxK+sGF1dWrVbJ/w wd/FNTM9TZVNe3qGDADC4yFI2Rre6UtlPcYPW7tjSJse+oPGYYg7SixGiZjxvu6m dGUR3LxsRJh/kmNydbyInl1pz4KIoQ== =VjBH -----END PGP SIGNATURE----- --Sig_/CoM4KYEr_Pu0_WKx0t6EDH6-- . From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Shuah Khan Cc: Masami Hiramatsu , Tom Zanussi , Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 0/3] tracing: Support poll on event hist file Date: Wed, 3 Jul 2024 14:32:31 +0900 Message-Id: <171998475175.54594.7244942110355338359.stgit@devnote2> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266064 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-kselftest,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, Here is the v2 patch to support polling on event 'hist' file. The previous version is here; https://lore.kernel.org/all/171932861260.584123.15653284949837094747.stgit@devnote2/ This version updates the test program, because previous version will return fail on stable kernels which does not have this feature. This checks whether the poll(POLLIN) on hist is timeout or not without sending event. If poll() is implemented, it should timed out. If not, poll(POLLIN) retuns soon. And it tests both of POLLIN and POLLPRI in this version. Background ---------- There has been interest in allowing user programs to monitor kernel events in real time. Ftrace provides `trace_pipe` interface to wait on events in the ring buffer, but it is needed to wait until filling up a page with events in the ring buffer. We can also peek the `trace` file periodically, but that is inefficient way to monitor a randomely happening event. Overview -------- This patch set allows user to `poll`(or `select`, `epoll`) on event histogram interface. As you know each event has its own `hist` file which shows histograms generated by trigger action. So user can set a new hist trigger on any event you want to monitor, and poll on the `hist` file until it is updated. There are 2 poll events are supported, POLLIN and POLLPRI. POLLIN means that there are any readable update on `hist` file and this event will be flashed only when you call read(). So, this is useful if you want to read the histogram periodically. The other POLLPRI event is for monitoring trace event. Like the POLLIN, this will be returned when the histogram is updated, but you don't need to read() the file and use poll() again. Note that this waits for histogram update (not event arrival), thus you must set a histogram on the event at first. Usage ----- Here is an example usage: ---- TRACEFS=/sys/kernel/tracing EVENT=$TRACEFS/events/sched/sched_process_free # setup histogram trigger and enable event echo "hist:key=comm" >> $EVENT/trigger echo 1 > $EVENT/enable # Wait for update poll pri $EVENT/hist # Event arrived. echo "process free event is comming" tail $TRACEFS/trace ---- The 'poll' command is in the selftest patch. You can take this series also from here; https://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux.git/log/?h=topic/event-hist-poll Thank you, --- Masami Hiramatsu (Google) (3): tracing/hist: Add poll(POLLIN) support on hist file tracing/hist: Support POLLPRI event for poll on histogram selftests/tracing: Add hist poll() support test include/linux/trace_events.h | 5 + kernel/trace/trace_events.c | 18 ++++ kernel/trace/trace_events_hist.c | 101 +++++++++++++++++++- tools/testing/selftests/ftrace/Makefile | 2 tools/testing/selftests/ftrace/poll.c | 62 ++++++++++++ .../ftrace/test.d/trigger/trigger-hist-poll.tc | 74 +++++++++++++++ 6 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/ftrace/poll.c create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-poll.tc -- Masami Hiramatsu (Google) . From: Zhang Rui To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, ricardo.neri-calderon@linux.intel.com Subject: [PATCH] Thermal: intel: hfi: Give HFI instances package scope Date: Wed, 3 Jul 2024 13:54:45 +0800 Message-Id: <20240703055445.125362-1-rui.zhang@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266069 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The Intel Software Developer's Manual defines the scope of HFI (registers and memory buffer) as package. Use package scope* in the software representation of an HFI instance. Using die scope in HFI instances has the effect of creating multiple, conflicting, instances for the same package: each instance allocates its own memory buffer and configures the same package-level registers. Specifically, only one of the allocated memory buffers can be set in the MSR_IA32_HW_FEEDBACK_PTR register. CPUs get incorrect HFI data from the table. The problem does not affect current HFI-capable platforms because they all have single-die processors. * We used die scope for HFI instances because there have been processors in which packages where enumerated as dies. None of those systems support HFI. If such a system emerged we would need to quirk it. Co-developed-by: Chen Yu Signed-off-by: Chen Yu Signed-off-by: Zhang Rui --- drivers/thermal/intel/intel_hfi.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c index a180a98bb9f1..5b18a46a10b0 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -401,10 +401,10 @@ static void hfi_disable(void) * intel_hfi_online() - Enable HFI on @cpu * @cpu: CPU in which the HFI will be enabled * - * Enable the HFI to be used in @cpu. The HFI is enabled at the die/package - * level. The first CPU in the die/package to come online does the full HFI + * Enable the HFI to be used in @cpu. The HFI is enabled at the package + * level. The first CPU in the package to come online does the full HFI * initialization. Subsequent CPUs will just link themselves to the HFI - * instance of their die/package. + * instance of their package. * * This function is called before enabling the thermal vector in the local APIC * in order to ensure that @cpu has an associated HFI instance when it receives @@ -414,31 +414,31 @@ void intel_hfi_online(unsigned int cpu) { struct hfi_instance *hfi_instance; struct hfi_cpu_info *info; - u16 die_id; + u16 pkg_id; /* Nothing to do if hfi_instances are missing. */ if (!hfi_instances) return; /* - * Link @cpu to the HFI instance of its package/die. It does not + * Link @cpu to the HFI instance of its package. It does not * matter whether the instance has been initialized. */ info = &per_cpu(hfi_cpu_info, cpu); - die_id = topology_logical_die_id(cpu); + pkg_id = topology_logical_package_id(cpu); hfi_instance = info->hfi_instance; if (!hfi_instance) { - if (die_id >= max_hfi_instances) + if (pkg_id >= max_hfi_instances) return; - hfi_instance = &hfi_instances[die_id]; + hfi_instance = &hfi_instances[pkg_id]; info->hfi_instance = hfi_instance; } init_hfi_cpu_index(info); /* - * Now check if the HFI instance of the package/die of @cpu has been + * Now check if the HFI instance of the package of @cpu has been * initialized (by checking its header). In such case, all we have to * do is to add @cpu to this instance's cpumask and enable the instance * if needed. @@ -504,7 +504,7 @@ void intel_hfi_online(unsigned int cpu) * * On some processors, hardware remembers previous programming settings even * after being reprogrammed. Thus, keep HFI enabled even if all CPUs in the - * die/package of @cpu are offline. See note in intel_hfi_online(). + * package of @cpu are offline. See note in intel_hfi_online(). */ void intel_hfi_offline(unsigned int cpu) { @@ -674,9 +674,13 @@ void __init intel_hfi_init(void) if (hfi_parse_features()) return; - /* There is one HFI instance per die/package. */ - max_hfi_instances = topology_max_packages() * - topology_max_dies_per_package(); + /* + * Note: HFI resources are managed at the physical package scope. + * There could be platforms that enumerate packages as Linux dies. + * Special handling would be needed if this happens on an HFI-capable + * platform. + */ + max_hfi_instances = topology_max_packages(); /* * This allocation may fail. CPU hotplug callbacks must check -- 2.34.1 . From: Amirreza Zarrabi Subject: [PATCH RFC 0/3] Implement Qualcomm TEE IPC and ioctl calls Date: Tue, 2 Jul 2024 22:57:35 -0700 Message-ID: <20240702-qcom-tee-object-and-ioctls-v1-0-633c3ddf57ee@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Bjorn Andersson , Konrad Dybcio , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , , CC: , , , , "Amirreza Zarrabi" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266071 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Qualcomm TEE hosts Trusted Applications (TAs) and services that run in the secure world. Access to these resources is provided using MinkIPC. MinkIPC is a capability-based synchronous message passing facility. It allows code executing in one domain to invoke objects running in other domains. When a process holds a reference to an object that lives in another domain, that object reference is a capability. Capabilities allow us to separate implementation of policies from implementation of the transport. As part of the upstreaming of the object invoke driver (called SMC-Invoke driver), we need to provide a reasonable kernel API and UAPI. The clear option is to use TEE subsystem and write a back-end driver, however the TEE subsystem doesn't fit with the design of Qualcomm TEE. Does TEE subsystem fit requirements of a capability based system? ----------------------------------------------------------------- In TEE subsystem, to invoke a function: - client should open a device file "/dev/teeX", - create a session with a TA, and - invoke the functions in that session. 1. The privilege to invoke a function is determined by a session. If a client has a session, it cannot share it with other clients. Even if it does, it is not fine-grained enough, i.e. either all accessible functions/resources in a session or none. Assume a scenario when a client wants to grant a permission to invoke just a function that it has the rights, to another client. The "all or nothing" for sharing sessions is not in line with our capability system: "if you own a capability, you should be able to grant or share it". 2. In TEE subsystem, resources are managed in a context. Every time a client opens "/dev/teeX", a new context is created to keep track of the allocated resources, including opened sessions and remote objects. Any effort for sharing resources between two independent clients requires involvement of context manager, i.e. the back-end driver. This requires implementing some form of policy in the back-end driver. 3. The TEE subsystem supports two type of memory sharing: - per-device memory pools, and - user defined memory references. User defined memory references are private to the application and cannot be shared. Memory allocated from per-device "shared" pools are accessible using a file descriptor. It can be mapped by any process if it has access to it. This means, we cannot provide the resource isolation between two clients. Assume a scenario when a client wants to allocate a memory (which is shared with TEE) from an "isolated" pool and share it with another client, without the right to access the contents of memory. 4. The kernel API provided by TEE subsystem does not support a kernel supplicant. Adding support requires an execution context (e.g. a kernel thread) due to the TEE subsystem design. tee_driver_ops supports only "send" and "receive" callbacks and to deliver a request, someone should wait on "receive". We need a callback to "dispatch" or "handle" a request in the context of the client thread. It should redirect a request to a kernel service or a user supplicant. In TEE subsystem such requirement should be implemented in TEE back-end driver, independent from the TEE subsystem. 5. The UAPI provided by TEE subsystem is similar to the GPTEE Client interface. This interface is not suitable for a capability system. For instance, there is no session in a capability system which means either its should not be used, or we should overload its definition. Can we use TEE subsystem? ------------------------- There are workarounds for some of the issues above. The question is if we should define our own UAPI or try to use a hack-y way of fitting into the TEE subsystem. I am using word hack-y, as most of the workaround involves: - "diverging from the definition". For instance, ignoring the session open and close ioctl calls or use file descriptors for all remote resources (as, fd is the closet to capability) which undermines the isolation provided by the contexts, - "overloading the variables". For instance, passing object ID as file descriptors in a place of session ID, or - "bypass TEE subsystem". For instance, extensively rely on meta parameters or push everything (e.g. kernel services) to the back-end driver, which means leaving almost all TEE subsystem unused. We cannot take the full benefits of TEE subsystem and may need to implement most of the requirements in the back-end driver. Also, as discussed above, the UAPI is not suitable for capability-based use cases. We proposed a new set of ioctl calls for SMC-Invoke driver. In this series we posted three patches. We implemented a transport driver that provides qcom_tee_object. Any object on secure side is represented with an instance of qcom_tee_object and any struct exposed to TEE should embed an instance of qcom_tee_object. Any, support for new services, e.g. memory object, RPMB, userspace clients or supplicants are implemented independently from the driver. We have a simple memory object and a user driver that uses qcom_tee_object. Signed-off-by: Amirreza Zarrabi --- Amirreza Zarrabi (3): firmware: qcom: implement object invoke support firmware: qcom: implement memory object support for TEE firmware: qcom: implement ioctl for TEE object invocation drivers/firmware/qcom/Kconfig | 36 + drivers/firmware/qcom/Makefile | 2 + drivers/firmware/qcom/qcom_object_invoke/Makefile | 12 + drivers/firmware/qcom/qcom_object_invoke/async.c | 142 +++ drivers/firmware/qcom/qcom_object_invoke/core.c | 1139 ++++++++++++++++++ drivers/firmware/qcom/qcom_object_invoke/core.h | 186 +++ .../qcom/qcom_object_invoke/qcom_scm_invoke.c | 22 + .../firmware/qcom/qcom_object_invoke/release_wq.c | 90 ++ .../qcom/qcom_object_invoke/xts/mem_object.c | 406 +++++++ .../qcom_object_invoke/xts/object_invoke_uapi.c | 1231 ++++++++++++++++++++ include/linux/firmware/qcom/qcom_object_invoke.h | 233 ++++ include/uapi/misc/qcom_tee.h | 117 ++ 12 files changed, 3616 insertions(+) --- base-commit: 74564adfd3521d9e322cfc345fdc132df80f3c79 change-id: 20240702-qcom-tee-object-and-ioctls-6f52fde03485 Best regards, -- Amirreza Zarrabi . Date: Wed, 3 Jul 2024 16:16:18 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jul 3 Message-ID: <20240703161618.62bc65fd@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/oYYEiiD=5/f6Is5diHbe7_I"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266079 org.kernel.vger.linux-next:62077 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/oYYEiiD=5/f6Is5diHbe7_I Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, News: there will be no linux-next releases until Tuesday. Changes since 20240702: The mm-hotfixes tree still had its build failure for which I applied a patch. The mm tree lost its build failure. The powerpc tree gained a conflict against the mm tree. The pci tree lost its build failure. The net-next tree gained a conflict against the net tree. The drm tree still had its build failures so I used the version from next-20240627 and reverted a commit. The paulmck tree gained a conflict against the printk tree. The phy-next tree gained a conflict against the samsung-krzk tree. Non-merge commits (relative to Linus' tree): 9408 9888 files changed, 747592 insertions(+), 179192 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 378 trees (counting Linus' and 106 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (e9d22f7a6655 Merge tag 'linux_kselftest-fixes-6.10-r= c7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (e968e6d21d03 lib/build_OID_regist= ry: avoid non-destructive substitution for Perl < 5.13.2 compat) Applying: fixup for "mm: gup: stop abusing try_grab_folio" Merging vfs-brauner-fixes/vfs.fixes (655593a40efc afs: Convert comma to sem= icolon) Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1) Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1) Merging btrfs-fixes/next-fixes (5b63f5b7f7ba Merge branch 'misc-6.10' into = next-fixes) Merging vfs-fixes/fixes (bba1f6758a9e lirc: rc_dev_get_from_fd(): fix file = leak) Merging erofs-fixes/fixes (9b32b063be10 erofs: ensure m_llen is reset to 0 = if metadata is invalid) Merging nfsd-fixes/nfsd-fixes (ac03629b1612 Revert "nfsd: fix oops when rea= ding pool_stats before server is started") Merging v9fs-fixes/fixes/next (1613e604df0c Linux 6.10-rc1) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_v= erify_area()) Merging fs-current (971ae5795e0c Merge branch 'fixes' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (22a40d14b572 Linux 6.10-rc6) Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6) Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the fo= lio is reserved for no-mapping addresses) Merging arm64-fixes/for-next/fixes (ecc54006f158 arm64: Clear the initial I= D map correctly before remapping) Merging arm-soc-fixes/arm/fixes (07917ee08723 Merge tag 'v6.10-rockchip-dts= fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockch= ip into arm/fixes) Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) Merging drivers-memory-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging sophgo-fixes/fixes (90f6cc7f8e07 riscv: dts: sophgo: disable write-= protection for milkv duo) Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defcon= figs for v6.9-rc1) Merging powerpc-fixes/fixes (21a741eb75f8 powerpc/pseries: Fix scv instruct= ion crash with kexec) Merging s390-fixes/fixes (feaa3344ff97 s390: Update defconfigs) Merging net/main (8905a2c7d39b Merge branch 'net-txgbe-fix-msi-and-intx-int= errupts') Merging bpf/master (42391445a863 Merge tag 'for-net-2024-06-28' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth into main) Merging ipsec/master (2d5317753e5f xfrm: Export symbol xfrm_dev_state_delet= e.) Merging netfilter/main (8905a2c7d39b Merge branch 'net-txgbe-fix-msi-and-in= tx-interrupts') Merging ipvs/main (7931d32955e0 netfilter: nf_tables: fully validate NFT_DA= TA_VALUE on store to data registers) Merging wireless/for-next (816c6bec09ed wifi: mac80211: fix BSS_CHANGED_UNS= OL_BCAST_PROBE_RESP) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats upd= ates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (f2661062f16b Linux 6.10-rc5) Merging sound-current/for-linus (4b3e38107383 Merge tag 'asoc-fix-v6.10-rc5= ' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for= -linus) Merging sound-asoc-fixes/for-linus (2163aff6bebb firmware: cs_dsp: Prevent = buffer overrun when processing V2 alg headers) Merging regmap-fixes/for-linus (76f19626bd35 regmap: add missing MODULE_DES= CRIPTION() macros) Merging regulator-fixes/for-linus (f2661062f16b Linux 6.10-rc5) Merging spi-fixes/for-linus (1762dc01fc78 spi: davinci: Unset POWERDOWN bit= when releasing resources) Merging pci-current/for-linus (419d57d429f6 CREDITS: Add Synopsys DesignWar= e eDMA driver for Gustavo Pimentel) Merging driver-core.current/driver-core-linus (6ba59ff42279 Linux 6.10-rc4) Merging tty.current/tty-linus (22a40d14b572 Linux 6.10-rc6) Merging usb.current/usb-linus (22a40d14b572 Linux 6.10-rc6) Merging usb-serial-fixes/usb-linus (4298e400dbdb USB: serial: option: add T= elit generic core-dump composition) Merging phy/fixes (f2661062f16b Linux 6.10-rc5) Merging staging.current/staging-linus (22a40d14b572 Linux 6.10-rc6) Merging iio-fixes/fixes-togreg (1a5cba43096c iio: light: apds9306: Fix erro= r handing) Merging counter-current/counter-current (22a40d14b572 Linux 6.10-rc6) Merging char-misc.current/char-misc-linus (22a40d14b572 Linux 6.10-rc6) Merging soundwire-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging thunderbolt-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging input-current/for-linus (7c7b1be19b22 Input: ads7846 - use spi_devi= ce_id table) Merging crypto-current/master (a5d8922ab2ae crypto: qat - fix linking error= s when PCI_IOV is disabled) Merging vfio-fixes/for-linus (d71a989cf5d9 vfio/pci: Insert full vma on mma= p'd MMIO fault) Merging kselftest-fixes/fixes (48236960c06d selftests/resctrl: Fix non-cont= iguous CBM for AMD) Merging dmaengine-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NV= DDR timings are rejected) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix miss= ing IRQ status registers range) Merging v4l-dvb-fixes/fixes (fd404435d44b media: ivsc: Depend on IPU_BRIDGE= or not IPU_BRIDGE) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add= missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (0d5679a0aae2 mips: fix compat_sys_lseek sysc= all) Merging at91-fixes/at91-fixes (1613e604df0c Linux 6.10-rc1) Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang f= or am3 usb) Merging kvm-fixes/master (dee67a94d4c6 Merge tag 'kvm-x86-fixes-6.10-rcN' o= f https://github.com/kvm-x86/linux into HEAD) Merging kvms390-fixes/master (4c6abb7f7b34 KVM: s390: fix LPSWEY handling) Merging hwmon-fixes/hwmon (6ba59ff42279 Linux 6.10-rc4) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrec= t calculation of idt size) Merging cxl-fixes/fixes (a0f39d51dbf7 cxl: documentation: add missing files= to cxl driver-api) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restr= icted pool list_head when SWIOTLB_DYNAMIC=3Dy) Merging drivers-x86-fixes/fixes (e527a6127223 platform/x86: toshiba_acpi: F= ix quickstart quirk handling) Merging samsung-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-samsung-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging devicetree-fixes/dt/linus (e7985f43609c of: property: Fix fw_devlin= k handling of interrupt-map) Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging scsi-fixes/fixes (ab2068a6fb84 scsi: libsas: Fix exp-attached devic= e scan after probe failure scanned in again after probe failed) Merging drm-fixes/drm-fixes (22a40d14b572 Linux 6.10-rc6) Merging drm-intel-fixes/for-linux-next-fixes (f72383371e8c drm/i915/display= : For MTL+ platforms skip mg dp programming) Merging mmc-fixes/fixes (ab069ce12596 mmc: sdhci: Do not lock spinlock arou= nd mmc_gpio_get_ro()) Merging rtc-fixes/rtc-fixes (1613e604df0c Linux 6.10-rc1) Merging gnss-fixes/gnss-linus (6ba59ff42279 Linux 6.10-rc4) Merging hyperv-fixes/hyperv-fixes (3b85a2eacd3d Documentation: hyperv: Add = overview of Confidential Computing VM support) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (cc2c169e34b4 Merge patch "riscv: stacktrace: co= nvert arch_stack_walk() to noinstr") Merging riscv-dt-fixes/riscv-dt-fixes (e21de658f8e8 MAINTAINERS: thead: upd= ate Maintainer) Merging riscv-soc-fixes/riscv-soc-fixes (1613e604df0c Linux 6.10-rc1) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (a3e18a540541 Merge tag 'xfs-6.10-fixes-3' of git:/= /git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging gpio-brgl-fixes/gpio/for-current (3645ffaf2b33 gpiolib: of: fix loo= kup quirk for MIPS Lantiq) Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging kunit-fixes/kunit-fixes (1613e604df0c Linux 6.10-rc1) Merging memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() = helper to check for invalid node ID) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add= missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (83a7eefedc9b Linux 6.10-rc3) Merging efi-fixes/urgent (46e27b9961d8 efi/arm64: Fix kmemleak false positi= ve in arm64_efi_rt_init()) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bo= unds UBSAN warning) Merging battery-fixes/fixes (d3911f1639e6 power: supply: rt5033: Bring back= i2c_set_clientdata) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7) Merging rust-fixes/rust-fixes (a126eca84435 rust: avoid unused import warni= ng in `rusttest`) Merging w1-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pmdomain-fixes/fixes (c3f38fa61af7 Linux 6.10-rc2) Merging i2c-host-fixes/i2c/i2c-host-fixes (22a40d14b572 Linux 6.10-rc6) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (10f84de27bd0 Merge tag 'qcom-clk-fixes-for-6.1= 0' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-f= ixes) Merging pwrseq-fixes/pwrseq/for-current (83a7eefedc9b Linux 6.10-rc3) Merging drm-misc-fixes/for-linux-next-fixes (704c1bef3aa4 drm: panel-orient= ation-quirks: Add labels for both Valve Steam Deck revisions) Merging mm-stable/mm-stable (37a658069afb selftests/damon/damon_nr_regions:= test online-tuned max_nr_regions) Merging mm-nonmm-stable/mm-nonmm-stable (2a49c8b6b6d0 selftests/fpu: add mi= ssing MODULE_DESCRIPTION() macro) Merging mm/mm-everything (e6f9f50b8d1b foo) CONFLICT (content): Merge conflict in mm/gup.c Merging kbuild/for-next (fc8ad8ff95eb kconfig: remove E_LIST expression typ= e) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v= 6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (a7cacaa0880e perf sched replay: Fix -r/--repe= at command line option for infinity) CONFLICT (content): Merge conflict in tools/perf/builtin-record.c Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attr= ibutes: counted_by: fixup clang URL) Merging dma-mapping/for-next (82d71b53d7e7 Documentation/core-api: correct = reference to SWIOTLB_DYNAMIC) Merging asm-generic/master (01b6ed5fcd5a syscalls: fix sys_fanotify_mark pr= ototype) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (b5e352609497 Merge branches 'clkdev', 'fixes' and 'mi= sc' into for-next) Merging arm64/for-next/core (2de29d1f8172 Merge branch 'for-next/vcpu-hotpl= ug' into for-next/core) Merging arm-perf/for-next/perf (d0d7c66c537d perf: imx_perf: add support fo= r i.MX95 platform) Merging arm-soc/for-next (bf35f851523a soc: document merges) Merging amlogic/for-next (338c92a5d195 Merge branch 'v6.11/arm64-dt' into f= or-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (73feb9cd46f1 ARM: dts: aspeed: System1: Updates to= BMC board) Merging at91/at91-next (1cdb1c9626a4 Merge branch 'at91-defconfig' into at9= 1-next) Merging broadcom/next (4caff16b6e00 Merge branch 'devicetree-arm64/next' in= to next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (815cc7715ab1 dt-bindings: memory: fsl: rep= lace maintainer) Merging imx-mxs/for-next (ffa7b132ee5f Merge branch 'imx/defconfig' into fo= r-next) Merging mediatek/for-next (1613e604df0c Linux 6.10-rc1) Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10= ' into for-next) Merging qcom/for-next (4139ef135814 Merge branches 'arm32-for-6.11', 'arm64= -defconfig-fixes-for-6.10', 'arm64-defconfig-for-6.11', 'arm64-fixes-for-6.= 10', 'arm64-for-6.11', 'clk-fixes-for-6.10', 'clk-for-6.11', 'drivers-fixes= -for-6.10' and 'drivers-for-6.11' into for-next) Merging renesas/next (5c91aa40e630 Merge branches 'renesas-arm-defconfig-fo= r-v6.11' and 'renesas-dts-for-v6.11' into renesas-next) Merging reset/reset/next (eb5d88b15388 reset: RESET_IMX8MP_AUDIOMIX should = depend on ARCH_MXC) Merging rockchip/for-next (84a3d3b435e7 Merge branch 'v6.11-clk/next' into = for-next) Merging samsung-krzk/for-next (b305fd6840d1 Merge branch 'next/dt64' into f= or-next) Merging scmi/for-linux-next (eaaeef9e62f9 Merge tags 'scmi-updates-6.11', '= ffa-updates-6.11', 'vexpress-updates-6.11' and 'juno-updates-6.11' of ssh:/= /gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-l= inux-next) Merging sophgo/for-next (1613e604df0c Linux 6.10-rc1) Merging stm32/stm32-next (45fad67e8307 arm64: dts: st: enable Ethernet2 on = stm32mp257f-ev1 board) Merging sunxi/sunxi/for-next (0682fbf17dd9 Merge branches 'sunxi/clk-fixes-= for-6.10', 'sunxi/drivers-for-6.11' and 'sunxi/dt-for-6.11' into sunxi/for-= next) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v= 6.11' into next) Merging tegra/for-next (5211d93c551f Merge branch for-6.11/arm64/defconfig = into for-next) Merging ti/ti-next (0457310f1e9d Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (613af8986db8 Merge remote-tracking branch 'git/zyn= qmp/dt' into for-next) Merging clk/clk-next (2bf56243b7b6 Merge branch 'clk-samsung' into clk-next) Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL i= nstead of 0) Merging clk-renesas/renesas-clk (c7e58843d1e4 clk: renesas: r9a08g045: Add = clock, reset and power domain support for I2C) Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.= kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging loongarch/loongarch-next (8051b80fbeef LoongArch: Automatically dis= able KASLR for hibernation) Merging m68k/for-next (75d3891ca19e m68k: defconfig: Update defconfigs for = v6.10-rc1) Merging m68knommu/for-next (22a40d14b572 Linux 6.10-rc6) Merging microblaze/next (1613e604df0c Linux 6.10-rc1) Merging mips/mips-next (04f38d1a4db0 mips: bmips: enable RAC on BMIPS4350) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_= regs) Merging parisc-hd/for-next (5f55e098b8d0 parisc: Add 64-bit gettimeofday() = and clock_gettime() vDSO functions) Merging powerpc/next (17c743b9da9e selftests/sigaltstack: Fix ppc64 GCC bui= ld) CONFLICT (content): Merge conflict in arch/powerpc/mm/nohash/Makefile Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a wr= ite-only variable) Merging risc-v/for-next (60a6707f582e Merge patch series "riscv: Memory Hot= (Un)Plug support") CONFLICT (content): Merge conflict in arch/riscv/kernel/patch.c Merging riscv-dt/riscv-dt-for-next (2904244a8c46 riscv: dts: starfive: add = PCIe dts configuration for JH7110) Merging riscv-soc/riscv-soc-for-next (16b8597f1774 Merge branch 'riscv-cach= e-for-next' into riscv-soc-for-next) Merging s390/for-next (6566c83200ca Merge branch 'features' into for-next) Merging sh/for-next (1613e604df0c Linux 6.10-rc1) Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask va= r) Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove c= allback returning void) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush= _dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging bcachefs/for-next (d6d793ae5589 bcachefs: Simplify btree key cache = fill path) CONFLICT (content): Merge conflict in fs/bcachefs/super.c [fs-next 574941385bb1] Merge branch 'for-next' of https://evilpiepirate.org= /git/bcachefs.git Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git:/= /git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent = dentry in fscrypt_file_open) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), includi= ng server address) Merging btrfs/for-next (80d54c4200e1 Merge branch 'for-next-next-v6.10-2024= 0624' into for-next-20240624) CONFLICT (content): Merge conflict in fs/btrfs/qgroup.c CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c [fs-next b19a82b401e0] Merge branch 'for-next' of git://git.kernel.org/pub/= scm/linux/kernel/git/kdave/linux.git Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to ge= t CephFS metadata) Merging cifs/for-next (a3c1d574e8df cifs: Fix read-performance regression b= y dropping readahead expansion) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation per= formance) Merging dlm/next (89b01913dc73 dlm: add rcu_barrier before destroy kmem cac= he) Merging erofs/dev (f2661062f16b Linux 6.10-rc5) Merging exfat/dev (0daa52fbc7ac exfat: fix potential deadlock on __exfat_ge= t_dentry_set) Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) Merging ext4/dev (8262fe9a902c ext4: make ext4_da_map_blocks() buffer_head = unaware) Merging f2fs/dev (8cb1f4080dd9 f2fs: assign CURSEG_ALL_DATA_ATGC if blkaddr= is valid) Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init(= ) to avoid kmemleak warning) Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) Merging gfs2/for-next (5a1906a476bc gfs2: Revert "check for no eligible quo= ta changes") Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist) Merging ksmbd/ksmbd-for-next (6ba59ff42279 Linux 6.10-rc4) Merging nfs/linux-next (22a40d14b572 Linux 6.10-rc6) Merging nfs-anna/linux-next (e53a863bab58 nfs/blocklayout: SCSI layout trac= e points for reservation key reg/unreg) Merging nfsd/nfsd-next (b3984e398f08 MAINTAINERS: Add a bugzilla link for N= FSD) Merging ntfs3/master (bde63e8eae5d fs/ntfs3: Fix formatting, change comment= s, renaming) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid ac= cess) Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lo= wer only root) Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address acces= s in jffs2_free_inode) Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) Merging v9fs-ericvh/ericvh/for-next (1613e604df0c Linux 6.10-rc1) Merging xfs/for-next (3ba3ab1f6719 xfs: enable FITRIM on the realtime devic= e) Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large foli= os) Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_w= rite_iter()) Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counte= rs for online fsck) Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-= mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6= -mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging vfs-brauner/vfs.all (6cbc40abcac6 Merge branch 'vfs.iomap' into vfs= .all) CONFLICT (content): Merge conflict in fs/btrfs/inode.c [fs-next 37baa0045f3b] Merge branch 'vfs.all' of git://git.kernel.org/pub/s= cm/linux/kernel/git/vfs/vfs.git Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (37baa0045f3b Merge branch 'vfs.all' of git://git.kernel.or= g/pub/scm/linux/kernel/git/vfs/vfs.git) CONFLICT (content): Merge conflict in fs/nfs/internal.h Merging printk/for-next (07c2ab22a8da Merge branch 'for-6.11' into for-next) Merging pci/next (7f928a740870 Merge branch 'controller/tegra194' into next) CONFLICT (content): Merge conflict in drivers/pci/pci.c Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing = MODULE_DESCRIPTION() macro) Merging hid/for-next (07fbb3e88d22 Merge branch 'for-6.11/bpf' into for-nex= t) Merging i2c/i2c/for-next (6367df381ba9 Merge branch 'i2c/for-current' into = i2c/for-next) Merging i2c-host/i2c/i2c-host (04d6adabcdd5 dt-bindings: i2c: nxp,lpc1788-i= 2c: convert to dt schema) Merging i3c/i3c/next (145ca7b61e95 i3c: dw: Add optional apb clock) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for = number of populated and total memory slots) Merging hwmon-staging/hwmon-next (cd228e7b65d4 hwmon: add MP5920 driver) Merging jc_docs/docs-next (93dd11d0dd74 Merge branch 'docs-mw' into docs-ne= xt) Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMO= N_CLK) Merging v4l-dvb-next/master (156922faabce media: atomisp: Switch to new Int= el CPU model defines) Merging pm/linux-next (d203f7f03764 Merge branch 'pm-cpuidle' into linux-ne= xt) Merging cpufreq-arm/cpufreq/arm/linux-next (ce84b7beeb52 cpufreq: sti: add = missing MODULE_DEVICE_TABLE entry for stih418) Merging cpupower/cpupower (3a5bb5066f4c cpupower: fix lib default installat= ion path) Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use de= vm_clk_get_enabled() helpers) Merging pmdomain/next (cc647e931a24 pmdomain: amlogic: add missing MODULE_D= ESCRIPTION() macros) Merging opp/opp/linux-next (e3943f00afdb OPP: Introduce an OF helper functi= on to inform if required-opps is used) Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: conv= ert hisilicon-thermal.txt to dt-schema) Merging rdma/for-next (589b844f1bf0 RDMA/mlx5: Send UAR page index as ioctl= attribute) Merging net-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-dri= ver-fails-to-probe') CONFLICT (content): Merge conflict in drivers/net/ethernet/wangxun/libwx/wx= _hw.c CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h Merging bpf-next/for-next (fd8db07705c5 bpf, devmap: Add .map_alloc_check) CONFLICT (content): Merge conflict in arch/riscv/net/bpf_jit_comp64.c Applying: HID: bpf: Fix up build Merging ipsec-next/master (f531d13bdfe3 xfrm: support sending NAT keepalive= s in ESP in UDP states) Merging mlx5-next/mlx5-next (b339e0a39dc3 RDMA/mlx5: Add Qcounters req_tran= sport_retries_exceeded/req_rnr_retries_exceeded) Merging netfilter-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwm= ac-driver-fails-to-probe') Merging ipvs-next/main (f4ebd03496f6 netfilter: xt_recent: Lift restriction= s on max hitcount value) Merging bluetooth/master (31cdab2ae178 dt-bindings: net: bluetooth: convert= MT7622 Bluetooth to the json-schema) CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c Merging wireless-next/for-next (8c62617295d3 wifi: mac80211: remove DEAUTH_= NEED_MGD_TX_PREP) Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git:= //git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mtd/mtd/next (2538af030d6f mtd: cmdlinepart: Replace `dbg()` macro = with `pr_debug()`) Merging nand/nand/next (7326d3fb1ee3 mtd: rawnand: lpx32xx: Request DMA cha= nnels using DT entries) Merging spi-nor/spi-nor/next (d35df77707bf mtd: spi-nor: winbond: fix w25q1= 28 regression) Merging crypto/master (95c0f5c3b8bb hwrng: core - Fix wrong quality calcula= tion at hw rng registration) Merging drm/drm-next (fb625bf6187d Merge tag 'drm-habanalabs-next-2024-06-2= 3' of https://github.com/HabanaAI/drivers.accel.habanalabs.kernel into drm-= next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ato= mfirmware.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/d= cn35/dcn35_init.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_= types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c Applying: Revert "drm/omap: Allow build with COMPILE_TEST=3Dy" $ git reset --hard HEAD^ Merging next-20240627 version of drm CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ato= mfirmware.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/d= cn35/dcn35_init.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_= types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c [master cd560aa21550] next-20240627/drm Applying: Revert "drm/omap: Allow build with COMPILE_TEST=3Dy" [master 8279582a8eb3] next-20240627/drm Merging drm-exynos/for-linux-next (9347028bfcfc drm/exynos/vidi: convert to= struct drm_edid) Merging drm-misc/for-linux-next (e31538489908 drm/tests: Add tests for the = new Monochrome value of tv_mode) Merging amdgpu/drm-next (4ed6a3689cab drm/amdgpu/atomfirmware: silence UBSA= N warning) Merging drm-intel/for-linux-next (9fc97277eb2d drm/i915: Skip programming F= IA link enable bits for MTL+) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit = integer overflow) Merging drm-msm/msm-next (7775352a5f52 drm/msm/gem: Add missing rcu_derefer= ence()) Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-m= anaged allocation for mdp4_plane) Merging drm-xe/drm-xe-next (7c0389c615b5 drm/xe/guc: Demote GuC IDs usage m= essage to debug) Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block schedul= er when GPU is still active) Merging fbdev/for-next (7ee6cfe6d9cf fbdev: omap2: Return clk_prepare_enabl= e to transfer the error) Merging regmap/for-next (438685f6714a Merge remote-tracking branch 'regmap/= for-6.11' into regmap-next) Merging sound/for-next (5b707581c072 selftests/alsa:Fix printf format strin= g in pcm-test.c) Merging ieee1394/for-next (502099acb8cb firewire: core: Fix spelling mistak= es in tracepoint messages) Merging sound-asoc/for-next (2b5b8270c6ea Merge remote-tracking branch 'aso= c/for-6.11' into asoc-next) Merging modules/modules-next (61842868de13 module: create weak dependecies) Merging input/next (7c459517252e Input: ili210x - use guard notation when d= isabling and reenabling IRQ) CONFLICT (content): Merge conflict in include/linux/interrupt.h Merging block/for-next (5b3974db2723 Merge branch 'for-6.11/io_uring' into = for-next) CONFLICT (content): Merge conflict in fs/stat.c CONFLICT (content): Merge conflict in include/linux/fs.h Merging device-mapper/for-next (92b14c0230ff dm verity: add support for sig= nature verification with platform keyring) Merging libata/for-next (f5a0205ad031 Merge remote-tracking branch 'libata/= for-6.11' into HEAD) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIP= TION() macros) Merging mmc/next (f7e7e00f7b86 MAINTAINERS: drop entry for VIA SD/MMC contr= oller) Merging mfd/for-mfd-next (33c0e553c8c3 dt-bindings: mfd: syscon: Add APM po= weroff mailbox) Merging backlight/for-backlight-next (b337cc3ce475 backlight: lm3509_bl: Fi= x early returns in for_each_child_of_node()) Merging battery/for-next (b498ddb6f283 power: reset: piix4: add missing MOD= ULE_DESCRIPTION() macro) Merging regulator/for-next (db576ed76232 Add USB VBUS regulator for RZ/G2L) Merging security/next (9ca51b3176e0 Automated merge of 'dev' into 'next') Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL po= inter dereference) Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignme= nt during securityfs dentry remove) Merging selinux/next (e123134b39dc selinux: Use 1UL for EBITMAP_BIT to matc= h maps type) Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket= label) Merging tomoyo/master (b96342141183 rtnetlink: print rtnl_mutex holder/wait= er for debug purpose) Merging tpmdd/next (cf5ae3c7d48e tpm_tis_spi: add missing attpm20p SPI devi= ce ID entry) Merging watchdog/master (22a40d14b572 Linux 6.10-rc6) Merging iommu/next (cfb822815752 Merge branches 'fixes', 'allwinner/sun50i'= , 'qualcomm/msm', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) Merging audit/next (1613e604df0c Linux 6.10-rc1) Merging devicetree/for-next (bbf9b1ffa198 dt-bindings: interrupt-controller= : convert fsl,ls-scfg-msi to yaml) Merging dt-krzk/for-next (828f810f69f3 Merge branch 'next/dt64' into for-ne= xt) Merging mailbox/for-next (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Doc= ument the SDX75 IPCC) Merging spi/for-next (5b6cad81d0c1 Merge remote-tracking branch 'spi/for-6.= 11' into spi-next) Merging tip/master (e70c87e103e2 Merge x86/cache into tip/master) CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h CONFLICT (content): Merge conflict in include/linux/cacheinfo.h Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/a= rm_arch_timer: Mark hisi_161010101_oem_info const) Merging edac/edac-for-next (9a1c5fe0f0a8 Merge ras/edac-misc into for-next) Merging ftrace/for-next (5dfebf3c26dc Merge ring-buffer/for-next) CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h Merging rcu/next (a9e1661087f1 Merge branches 'doc.2024.06.06a', 'fixes.202= 4.06.18a', 'mb.2024.06.28a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a', '= rcutorture.2024.06.06a' and 'srcu.2024.06.18a' into HEAD) Merging paulmck/non-rcu/next (32584f42dec8 rcutorture: Make rcu_torture_wri= te_types() print number of update types) CONFLICT (content): Merge conflict in kernel/rcu/tree_exp.h Merging kvm/next (02b0d3b9d4dd Merge branch 'kvm-6.10-fixes' into HEAD) CONFLICT (content): Merge conflict in arch/x86/include/asm/sev-common.h Merging kvm-arm/next (62933f02c855 Merge branch kvm-arm64/docs into kvmarm/= next) Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2) Merging kvm-ppc/topic/ppc-kvm (0b65365f3fa9 KVM: PPC: Book3S HV nestedv2: K= eep nested guest HASHPKEYR in sync) Merging kvm-riscv/riscv_kvm_next (e325618349cd RISC-V: KVM: Redirect AMO lo= ad/store access fault traps to guest) CONFLICT (content): Merge conflict in tools/perf/arch/riscv/util/Build Merging kvm-x86/next (771df9ffadb8 Merge branch 'static_calls') Merging xen-tip/linux-next (611ff1b1ae98 xen: privcmd: Fix possible access = to a freed kirqfd instance) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for= -next) Merging workqueues/for-next (c6eff66fe16e Merge branch 'for-6.11' into for-= next) Merging sched-ext/for-next (18b2bd03371b sched_ext: Documentation: Remove m= entions of scx_bpf_switch_all) Merging drivers-x86/for-next (4261031484d8 Merge branch 'pdx86/platform-dri= vers-x86-lenovo-c630' into review-ilpo) Merging chrome-platform/for-next (3664706e875f power: supply: cros_charge-c= ontrol: don't load if Framework control is present) Merging chrome-platform-firmware/for-firmware-next (fc2c1d716d4a firmware: = google: add missing MODULE_DESCRIPTION() macros) Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/g= pio.h) Merging leds-lj/for-leds-next (940b27161afc Revert "leds: led-core: Fix ref= count leak in of_led_get()") CONFLICT (content): Merge conflict in MAINTAINERS Merging ipmi/for-next (0627cef36145 ipmi: ssif_bmc: prevent integer overflo= w on 32bit systems) Merging driver-core/driver-core-next (6b521fc111a2 MAINTAINERS: add Rust de= vice abstractions to DRIVER CORE) CONFLICT (content): Merge conflict in drivers/fsi/fsi-occ.c CONFLICT (content): Merge conflict in drivers/reset/reset-meson-audio-arb.c Applying: net: ethernet: rtsn: Fix up for remove() coversion to return void Applying: drm: Fix up STM LVDS driver for void remove() conversion Merging usb/usb-next (f7697db8b1b3 Merge 6.10-rc6 into usb-next) Merging thunderbolt/next (49056c95df44 thunderbolt: debugfs: Use FIELD_GET(= )) Merging usb-serial/usb-next (6ba59ff42279 Linux 6.10-rc4) Merging tty/tty-next (33827dc4ad89 Merge 6.10-rc6 into tty-next) Merging char-misc/char-misc-next (19ed3bb5587b Merge 6.10-rc6 into char-mis= c-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ven= dor-prefixes.yaml CONFLICT (content): Merge conflict in MAINTAINERS Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-20= 24-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) Merging coresight/next (2e5657aa5966 hwtracing: use for_each_endpoint_of_no= de()) Merging fastrpc/for-next (47bf4198bf38 MAINTAINERS: CC dri-devel list on Qu= alcomm FastRPC patches) Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused = struct 'prop_map') Merging icc/icc-next (3c6ffb017091 Merge branch 'icc-msm8953' into icc-next) Merging iio/togreg (529d2e190064 iio: adc: ad7173: Fix uninitialized symbol= is_current_chan) Merging phy-next/next (2a011c3c12e8 phy: airoha: Add dtime and Rx AEQ IO re= gisters) CONFLICT (content): Merge conflict in include/linux/soc/samsung/exynos-regs= -pmu.h Merging soundwire/next (518aee32c551 drivers:soundwire: qcom: cleanup port = maask calculations) Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB sw= itch driver) Merging gnss/gnss-next (6ba59ff42279 Linux 6.10-rc4) Merging vfio/next (abe8103da3c5 vfio/pci: Fix typo in macro to declare acce= ssors) Merging w1/for-next (26bf5fc86033 w1: Drop allocation error message) Merging spmi/spmi-next (1613e604df0c Linux 6.10-rc1) Merging staging/staging-next (d67f063101f5 Merge 6.10-rc6 into staging-next) Merging counter-next/counter-next (7b47e79eac4c Merge tag 'ib-mfd-counter-v= 5.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/lee/mfd into co= unter-next) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using dev= m_siox_* functions) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (316d1225b112 dmaengine: fsl-dpaa2-qdma: add missing= MODULE_DESCRIPTION() macro) Merging cgroup/for-next (3756b08be683 Merge branch 'for-6.11' into for-next) Merging scsi/for-next (dbe36d249533 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (06b91c00db39 Merge patch series "mpi3mr: Host di= ag buffer support") Merging vhost/linux-next (c8fae27d141a virtio-pci: Check if is_avq is NULL) Merging rpmsg/for-next (54fb559c5467 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (6f2a87502499 gpiolib: unexport gpiochip_ge= t_desc()) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (0cd9f140389b pinctrl: mlxbf3: Fix return value ch= eck for devm_platform_ioremap_resource) Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl-renesas/renesas-pinctrl (71062e52fc0a pinctrl: renesas: r8a= 779h0: Remove unneeded separators) Merging pinctrl-samsung/for-next (707807f4c112 pinctrl: samsung: Use scope = based of_node_put() cleanups) Merging pwm/pwm/for-next (b8689bb9b901 pwm-stm32: Make use of parametrised = register definitions) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly =3D 1 for 'mak= e_warnings_file' test type) Merging kselftest/next (15a783a493b0 selftests: Add information about TAP c= onformance in tests) Merging kunit/test (1613e604df0c Linux 6.10-rc1) Merging kunit-next/kunit (67c9971cd6d3 kunit/usercopy: Add missing MODULE_D= ESCRIPTION()) Merging livepatching/for-next (9871e6af43db Merge branch 'for-6.11/sysfs-pa= tch-replace' into for-next) Merging rtc/rtc-next (43696b3a9e46 rtc: isl1208: Update correct procedure f= or clearing alarm) Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE= _DESCRIPTION() macros) Merging at24/at24/for-next (1613e604df0c Linux 6.10-rc1) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (f0c508faea64 selftests/seccomp: check tha= t a zombie leader doesn't affect others) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (1613e604df0c Linux 6.10-rc1) Merging nvmem/for-next (65f09ab3b3ef Merge branches 'nvmem-fixes' and 'for-= 6.11' into nvmem-for-next) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic()= doc) Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to= seed guest random number generator) Merging auxdisplay/for-next (2ccfe94bc3ac auxdisplay: ht16k33: Drop referen= ce after LED registration) Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr= _task()) Merging hmm/hmm (6613476e225e Linux 6.8-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (f08d4bdad612 bus: mhi: host: pci_generic: Use unique = 'mhi_pci_dev_info' for product families) Merging memblock/for-next (94ff46de4a73 memblock: Move late alloc warning d= own to phys alloc) CONFLICT (content): Merge conflict in mm/memblock.c Merging cxl/next (f3d70720e92c cxl/region: Simplify cxl_region_nid()) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (d68cc8abc357 x86/efistub: Call Apple set_os protocol on d= ual GPU Intel Macs) Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() ma= cros) Merging slab/slab/for-next (a7555f5f17d7 mm/util: Use dedicated slab bucket= s for memdup_user()) CONFLICT (content): Merge conflict in lib/fortify_kunit.c Merging random/master (886d4870bede x86: vdso: Wire up getrandom() vDSO imp= lementation) CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/sysca= ll.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32= .tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64= .tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32= .tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.t= bl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.= tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.t= bl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in mm/rmap.c Merging landlock/next (591561c2b47b landlock: Use bit-fields for storing ha= ndled layer access masks) Merging rust/rust-next (1613e604df0c Linux 6.10-rc1) Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname = element) Merging execve/for-next/execve (2a97388a807b ELF: fix kernel.randomize_va_s= pace double read) Merging bitmap/bitmap-for-next (e0eeb938adb0 bitops: Add a comment explaini= ng the double underscore macros) CONFLICT (content): Merge conflict in include/linux/cpumask.h Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCR= IPTION() macro) Merging kspp/for-next/kspp (350e853715b2 Merge branches 'for-linus/hardenin= g' and 'for-next/hardening' into for-next/kspp) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (1613e604df0c Linux 6.10-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation su= pport using TSM_REPORTS) Merging iommufd/for-next (53e6b65693b6 iommufd/iova_bitmap: Remove iterator= logic) Merging turbostat/next (eff04be3f4aa tools/power turbostat: Extend --add op= tion with perf counters) Merging pwrseq/pwrseq/for-next (6140d185a43d PCI/pwrctl: Add a PCI power co= ntrol driver for power sequenced devices) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing b= uild for PREEMPT_RT) --Sig_/oYYEiiD=5/f6Is5diHbe7_I Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaE7LIACgkQAVBC80lX 0GyX3wgAkqfJLqzwfGrqhg2nAl9LQgVUKoEhfVg9BLZyIGf1k4O+2SKn1Pn/mq1+ TZDL/fz3xywOTQ1GEdFsLZX4PAfah0LLFO5Z0HJjjlAcByfmDU8VKno+0sHkDxmn 1tz6sedDWKuGalJPcTt55RiG6pfj0u1KN5v/C7ooan1kSxb4Yd5LBut2LWj5iTtC /bhGYemRJOGK5lJyXajn+sDPuIkFP41S8yn4wOdxSYGVnNIPADK2ZRvbA4/NBXjI bO9p1V6kcREZyZqf2Wpz5LfkF0Pq+biM8LygI0HAwcJy5qV73A/o0l7Blh1+6gxL nOm1Y1IV79gSTI9FVDjOR/cC2J9OHw== =oCSR -----END PGP SIGNATURE----- --Sig_/oYYEiiD=5/f6Is5diHbe7_I-- . Date: Wed, 3 Jul 2024 08:23:29 +0200 From: Mauro Carvalho Chehab To: Linus Torvalds Cc: Greg Kroah-Hartman , Andrew Morton , Linux Media Mailing List , Linux Kernel Mailing List Subject: [GIT PULL for v6.10-rc7] media fixes Message-ID: <20240703082329.20b1bc37@coco.lan> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266081 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.10-3 For some fixes related to the IPU6 driver. Regards, Mauro The following changes since commit 83a7eefedc9b56fe7bfeff13b6c7356688ffa670: Linux 6.10-rc3 (2024-06-09 14:19:43 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.10-3 for you to fetch changes up to fd404435d44b453d62afe77545b9252c2cc72c8a: media: ivsc: Depend on IPU_BRIDGE or not IPU_BRIDGE (2024-06-15 11:51:23 +0200) ---------------------------------------------------------------- media fixes for v6.10-rc7 ---------------------------------------------------------------- Hao Ge (1): media: intel/ipu6: Fix a null pointer dereference in ipu6_isys_query_stream_by_source Sakari Ailus (2): media: ipu6: Use the ISYS auxdev device as the V4L2 device's device media: ivsc: Depend on IPU_BRIDGE or not IPU_BRIDGE drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 2 +- drivers/media/pci/intel/ipu6/ipu6-isys.c | 2 +- drivers/media/pci/intel/ivsc/Kconfig | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) . From: zelong dong To: Neil Armstrong , Philipp Zabel , Kevin Hilman , Rob Herring , Martin Blumenstingl , Jerome Brunet , Krzysztof Kozlowski CC: , , , , , Zelong Dong Subject: [PATCH 0/3] reset: amlogic-a4/a5: add reset driver Date: Wed, 3 Jul 2024 14:16:07 +0800 Message-ID: <20240703061610.37217-1-zelong.dong@amlogic.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266083 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-amlogic,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Zelong Dong This patchset adds Reset controller driver support for Amlogic A4/A5 SoC. The RESET registers count and offset for A4/A5 Soc are same as S4 Soc. Zelong Dong (3): dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller arm64: dts: amlogic: Add Amlogic A4 reset controller arm64: dts: amlogic: Add Amlogic A5 reset controller .../bindings/reset/amlogic,meson-reset.yaml | 22 +++-- .../boot/dts/amlogic/amlogic-a4-common.dtsi | 8 ++ .../arm64/boot/dts/amlogic/amlogic-a4-reset.h | 93 ++++++++++++++++++ arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 1 + .../arm64/boot/dts/amlogic/amlogic-a5-reset.h | 95 +++++++++++++++++++ arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 1 + 6 files changed, 213 insertions(+), 7 deletions(-) create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h -- 2.35.1 . Date: Wed, 3 Jul 2024 16:33:17 +1000 From: Stephen Rothwell To: Mauro Carvalho Chehab Cc: Linux Kernel Mailing List , Linux Next Mailing List , Hans Verkuil Subject: linux-next: Signed-off-by missing for commit in the v4l-dvb-next tree Message-ID: <20240703163317.55618738@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/sllqxGHvK/2_IlTb_AweqGh"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266089 org.kernel.vger.linux-next:62078 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/sllqxGHvK/2_IlTb_AweqGh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Commit 57dd8f2f77bc ("Revert "media: stm32: dcmipp: correct error handling in dc= mipp_create_subdevs"") is missing a Signed-off-by from its author and committer. Reverts are commits as well. --=20 Cheers, Stephen Rothwell --Sig_/sllqxGHvK/2_IlTb_AweqGh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaE8K0ACgkQAVBC80lX 0Gz1RQf9Evqf3Y8eZYwZi1nSj5qQqefHXoiBtoaIe5627jR7W+zqJb2dzMwj9VFB ocY1N/33wo4N9mIN9+WAnVcN32PDEyQR9ei3Y/XwdwyU8b6ewIT6IQfcZJLtgaqI ejmYPtxoZ5rQ4tv5BFRrA92MNRRT9EQMmTbM4ZRgBVn+uQsWFoO/OgjZH3ZYefvg MDCC1Svg8Olnv7JxIMLgzUIhvBGj0io5wXOqoLUFKG6UeDIQJN46RT58WavPqamp FmjIsO2KAsUHCCIXJYY20xj+uyGvXXD+LZooT/JXBZBw3Xno71oKdOqVIBBA0j3e NTzWlxekN85dkEg4AsaPl2K5a4Q61Q== =J7fF -----END PGP SIGNATURE----- --Sig_/sllqxGHvK/2_IlTb_AweqGh-- . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Tue, 02 Jul 2024 23:51:22 -0700 Message-ID: <00000000000023e1ce061c524270@google.com> Subject: [syzbot] [bcachefs?] INFO: task hung in bch2_direct_write From: syzbot To: bfoster@redhat.com, kent.overstreet@linux.dev, linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266104 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-bcachefs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: de0a9f448633 Merge tag 'riscv-for-linus-6.10-rc6' of git:/.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=141718be980000 kernel config: https://syzkaller.appspot.com/x/.config?x=67463c0717b8d4ca dashboard link: https://syzkaller.appspot.com/bug?extid=1bad52f1790df954e281 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/f3b0731376e4/disk-de0a9f44.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/64cc7704ba12/vmlinux-de0a9f44.xz kernel image: https://storage.googleapis.com/syzbot-assets/dd03addcf685/bzImage-de0a9f44.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+1bad52f1790df954e281@syzkaller.appspotmail.com INFO: task syz.1.13:5198 blocked for more than 143 seconds. Not tainted 6.10.0-rc5-syzkaller-00253-gde0a9f448633 #0 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:syz.1.13 state:D stack:14448 pid:5198 tgid:5197 ppid:5082 flags:0x00000004 Call Trace: context_switch kernel/sched/core.c:5408 [inline] __schedule+0x1796/0x49d0 kernel/sched/core.c:6745 __schedule_loop kernel/sched/core.c:6822 [inline] schedule+0x14b/0x320 kernel/sched/core.c:6837 schedule_preempt_disabled+0x13/0x30 kernel/sched/core.c:6894 rwsem_down_write_slowpath+0xeeb/0x13b0 kernel/locking/rwsem.c:1178 __down_write_common+0x1af/0x200 kernel/locking/rwsem.c:1306 inode_lock include/linux/fs.h:791 [inline] bch2_direct_write+0x243/0x3050 fs/bcachefs/fs-io-direct.c:598 bch2_write_iter+0x206/0x2840 fs/bcachefs/fs-io-buffered.c:1135 do_iter_readv_writev+0x5a4/0x800 vfs_writev+0x395/0xbe0 fs/read_write.c:971 do_pwritev fs/read_write.c:1072 [inline] __do_sys_pwritev2 fs/read_write.c:1131 [inline] __se_sys_pwritev2+0x1ca/0x2d0 fs/read_write.c:1122 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f73b9175b99 RSP: 002b:00007f73b9fcf048 EFLAGS: 00000246 ORIG_RAX: 0000000000000148 RAX: ffffffffffffffda RBX: 00007f73b9303fa0 RCX: 00007f73b9175b99 RDX: 0000000000000001 RSI: 0000000020000100 RDI: 0000000000000005 RBP: 00007f73b91f677e R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007f73b9303fa0 R15: 00007fff0b9b3f38 INFO: task syz.1.13:5245 blocked for more than 144 seconds. Not tainted 6.10.0-rc5-syzkaller-00253-gde0a9f448633 #0 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:syz.1.13 state:D stack:27392 pid:5245 tgid:5197 ppid:5082 flags:0x00000004 Call Trace: context_switch kernel/sched/core.c:5408 [inline] __schedule+0x1796/0x49d0 kernel/sched/core.c:6745 __schedule_loop kernel/sched/core.c:6822 [inline] schedule+0x14b/0x320 kernel/sched/core.c:6837 schedule_preempt_disabled+0x13/0x30 kernel/sched/core.c:6894 rwsem_down_write_slowpath+0xeeb/0x13b0 kernel/locking/rwsem.c:1178 __down_write_common+0x1af/0x200 kernel/locking/rwsem.c:1306 inode_lock include/linux/fs.h:791 [inline] bch2_fallocate_dispatch+0x295/0x3810 fs/bcachefs/fs-io.c:774 vfs_fallocate+0x564/0x6c0 fs/open.c:330 ksys_fallocate fs/open.c:353 [inline] __do_sys_fallocate fs/open.c:361 [inline] __se_sys_fallocate fs/open.c:359 [inline] __x64_sys_fallocate+0xbd/0x110 fs/open.c:359 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f73b9175b99 RSP: 002b:00007f73b9f8d048 EFLAGS: 00000246 ORIG_RAX: 000000000000011d RAX: ffffffffffffffda RBX: 00007f73b9304150 RCX: 00007f73b9175b99 RDX: 0000000000004000 RSI: 0000000000000008 RDI: 0000000000000005 RBP: 00007f73b91f677e R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000001000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000006e R14: 00007f73b9304150 R15: 00007fff0b9b3f38 INFO: task syz.1.13:5247 blocked for more than 144 seconds. Not tainted 6.10.0-rc5-syzkaller-00253-gde0a9f448633 #0 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:syz.1.13 state:D stack:24120 pid:5247 tgid:5197 ppid:5082 flags:0x00000004 Call Trace: context_switch kernel/sched/core.c:5408 [inline] __schedule+0x1796/0x49d0 kernel/sched/core.c:6745 __schedule_loop kernel/sched/core.c:6822 [inline] schedule+0x14b/0x320 kernel/sched/core.c:6837 schedule_preempt_disabled+0x13/0x30 kernel/sched/core.c:6894 rwsem_down_write_slowpath+0xeeb/0x13b0 kernel/locking/rwsem.c:1178 __down_write_common+0x1af/0x200 kernel/locking/rwsem.c:1306 inode_lock include/linux/fs.h:791 [inline] process_measurement+0x43c/0x1fb0 security/integrity/ima/ima_main.c:250 ima_file_check+0xf2/0x170 security/integrity/ima/ima_main.c:572 security_file_post_open+0x6d/0xa0 security/security.c:2982 do_open fs/namei.c:3652 [inline] path_openat+0x28f6/0x3280 fs/namei.c:3807 do_filp_open+0x235/0x490 fs/namei.c:3834 do_sys_openat2+0x13e/0x1d0 fs/open.c:1405 do_sys_open fs/open.c:1420 [inline] __do_sys_openat fs/open.c:1436 [inline] __se_sys_openat fs/open.c:1431 [inline] __x64_sys_openat+0x247/0x2a0 fs/open.c:1431 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f73b9175b99 RSP: 002b:00007f73b9f6c048 EFLAGS: 00000246 ORIG_RAX: 0000000000000101 RAX: ffffffffffffffda RBX: 00007f73b9304228 RCX: 00007f73b9175b99 RDX: 000000000006b142 RSI: 0000000020004400 RDI: ffffffffffffff9c RBP: 00007f73b91f677e R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000006e R14: 00007f73b9304228 R15: 00007fff0b9b3f38 INFO: task syz.1.13:5251 blocked for more than 145 seconds. Not tainted 6.10.0-rc5-syzkaller-00253-gde0a9f448633 #0 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:syz.1.13 state:D stack:19360 pid:5251 tgid:5197 ppid:5082 flags:0x00000004 Call Trace: context_switch kernel/sched/core.c:5408 [inline] __schedule+0x1796/0x49d0 kernel/sched/core.c:6745 __schedule_loop kernel/sched/core.c:6822 [inline] schedule+0x14b/0x320 kernel/sched/core.c:6837 schedule_preempt_disabled+0x13/0x30 kernel/sched/core.c:6894 rwsem_down_write_slowpath+0xeeb/0x13b0 kernel/locking/rwsem.c:1178 __down_write_common+0x1af/0x200 kernel/locking/rwsem.c:1306 inode_lock include/linux/fs.h:791 [inline] process_measurement+0x43c/0x1fb0 security/integrity/ima/ima_main.c:250 ima_file_check+0xf2/0x170 security/integrity/ima/ima_main.c:572 security_file_post_open+0x6d/0xa0 security/security.c:2982 do_open fs/namei.c:3652 [inline] path_openat+0x28f6/0x3280 fs/namei.c:3807 do_filp_open+0x235/0x490 fs/namei.c:3834 do_sys_openat2+0x13e/0x1d0 fs/open.c:1405 do_sys_open fs/open.c:1420 [inline] __do_sys_open fs/open.c:1428 [inline] __se_sys_open fs/open.c:1424 [inline] __x64_sys_open+0x225/0x270 fs/open.c:1424 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f73b9175b99 RSP: 002b:00007f73b9f4b048 EFLAGS: 00000246 ORIG_RAX: 0000000000000002 RAX: ffffffffffffffda RBX: 00007f73b9304300 RCX: 00007f73b9175b99 RDX: 0000000000000000 RSI: 0000000000141042 RDI: 0000000020000100 RBP: 00007f73b91f677e R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000006e R14: 00007f73b9304300 R15: 00007fff0b9b3f38 Showing all locks held in the system: 1 lock held by khungtaskd/30: #0: ffffffff8e333f60 (rcu_read_lock){....}-{1:2}, at: rcu_lock_acquire include/linux/rcupdate.h:329 [inline] #0: ffffffff8e333f60 (rcu_read_lock){....}-{1:2}, at: rcu_read_lock include/linux/rcupdate.h:781 [inline] #0: ffffffff8e333f60 (rcu_read_lock){....}-{1:2}, at: debug_show_all_locks+0x55/0x2a0 kernel/locking/lockdep.c:6614 2 locks held by getty/4840: #0: ffff88802adec0a0 (&tty->ldisc_sem){++++}-{0:0}, at: tty_ldisc_ref_wait+0x25/0x70 drivers/tty/tty_ldisc.c:243 #1: ffffc900031432f0 (&ldata->atomic_read_lock){+.+.}-{3:3}, at: n_tty_read+0x6b5/0x1e10 drivers/tty/n_tty.c:2211 2 locks held by syz.1.13/5198: #0: ffff888063c74420 (sb_writers#14){.+.+}-{0:0}, at: file_start_write include/linux/fs.h:2854 [inline] #0: ffff888063c74420 (sb_writers#14){.+.+}-{0:0}, at: vfs_writev+0x2d9/0xbe0 fs/read_write.c:969 #1: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: inode_lock include/linux/fs.h:791 [inline] #1: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: bch2_direct_write+0x243/0x3050 fs/bcachefs/fs-io-direct.c:598 3 locks held by syz.1.13/5241: #0: ffff88802bf6d4c8 (&f->f_pos_lock){+.+.}-{3:3}, at: __fdget_pos+0x24e/0x310 fs/file.c:1191 #1: ffff888063c74420 (sb_writers#14){.+.+}-{0:0}, at: file_start_write include/linux/fs.h:2854 [inline] #1: ffff888063c74420 (sb_writers#14){.+.+}-{0:0}, at: vfs_write+0x227/0xc90 fs/read_write.c:586 #2: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: inode_lock include/linux/fs.h:791 [inline] #2: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: bch2_direct_write+0x243/0x3050 fs/bcachefs/fs-io-direct.c:598 2 locks held by syz.1.13/5245: #0: ffff888063c74420 (sb_writers#14){.+.+}-{0:0}, at: file_start_write include/linux/fs.h:2854 [inline] #0: ffff888063c74420 (sb_writers#14){.+.+}-{0:0}, at: vfs_fallocate+0x4d3/0x6c0 fs/open.c:329 #1: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: inode_lock include/linux/fs.h:791 [inline] #1: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: bch2_fallocate_dispatch+0x295/0x3810 fs/bcachefs/fs-io.c:774 1 lock held by syz.1.13/5247: #0: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: inode_lock include/linux/fs.h:791 [inline] #0: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: process_measurement+0x43c/0x1fb0 security/integrity/ima/ima_main.c:250 1 lock held by syz.1.13/5251: #0: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: inode_lock include/linux/fs.h:791 [inline] #0: ffff888061739788 (&sb->s_type->i_mutex_key#23){+.+.}-{3:3}, at: process_measurement+0x43c/0x1fb0 security/integrity/ima/ima_main.c:250 1 lock held by syz-executor/6973: #0: ffffffff8e339338 (rcu_state.exp_mutex){+.+.}-{3:3}, at: exp_funnel_lock kernel/rcu/tree_exp.h:323 [inline] #0: ffffffff8e339338 (rcu_state.exp_mutex){+.+.}-{3:3}, at: synchronize_rcu_expedited+0x451/0x830 kernel/rcu/tree_exp.h:939 ============================================= NMI backtrace for cpu 0 CPU: 0 PID: 30 Comm: khungtaskd Not tainted 6.10.0-rc5-syzkaller-00253-gde0a9f448633 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/07/2024 Call Trace: __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114 nmi_cpu_backtrace+0x49c/0x4d0 lib/nmi_backtrace.c:113 nmi_trigger_cpumask_backtrace+0x198/0x320 lib/nmi_backtrace.c:62 trigger_all_cpu_backtrace include/linux/nmi.h:162 [inline] check_hung_uninterruptible_tasks kernel/hung_task.c:223 [inline] watchdog+0xfde/0x1020 kernel/hung_task.c:379 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 Sending NMI from CPU 0 to CPUs 1: NMI backtrace for cpu 1 CPU: 1 PID: 5671 Comm: syz-executor Not tainted 6.10.0-rc5-syzkaller-00253-gde0a9f448633 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/07/2024 RIP: 0010:check_preemption_disabled+0x19/0x120 lib/smp_processor_id.c:14 Code: 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 41 57 41 56 41 54 53 48 83 ec 10 65 48 8b 04 25 28 00 00 00 48 89 44 24 08 <65> 8b 1d 6c 90 86 74 65 8b 05 61 90 86 74 a9 ff ff ff 7f 74 26 65 RSP: 0018:ffffc900049af328 EFLAGS: 00000286 RAX: 210125f3d94ac900 RBX: 0000000000000001 RCX: ffffffff817266c4 RDX: 0000000000000000 RSI: ffffffff8c1f1760 RDI: ffffffff8c1f1720 RBP: ffffc900049af4d0 R08: ffffffff8fac242f R09: 1ffffffff1f58485 R10: dffffc0000000000 R11: fffffbfff1f58486 R12: 1ffff92000935e78 R13: dffffc0000000000 R14: 0000000000000000 R15: ffffc900049af820 FS: 0000555570538500(0000) GS:ffff8880b9500000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00005628575020e0 CR3: 00000000591e0000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: rcu_dynticks_curr_cpu_in_eqs include/linux/context_tracking.h:122 [inline] rcu_is_watching+0x15/0xb0 kernel/rcu/tree.c:724 trace_lock_acquire include/trace/events/lock.h:24 [inline] lock_acquire+0xe3/0x550 kernel/locking/lockdep.c:5725 rcu_lock_acquire include/linux/rcupdate.h:329 [inline] rcu_read_lock include/linux/rcupdate.h:781 [inline] percpu_ref_put_many include/linux/percpu-refcount.h:330 [inline] percpu_ref_put+0x36/0x180 include/linux/percpu-refcount.h:351 __mem_cgroup_uncharge_folios+0xdf/0x1c0 mm/memcontrol.c:7737 mem_cgroup_uncharge_folios include/linux/memcontrol.h:721 [inline] folios_put_refs+0x932/0xa60 mm/swap.c:1023 folio_batch_release include/linux/pagevec.h:101 [inline] shmem_undo_range+0x6de/0x1df0 mm/shmem.c:1005 shmem_truncate_range mm/shmem.c:1114 [inline] shmem_evict_inode+0x29b/0xa60 mm/shmem.c:1242 evict+0x2a8/0x630 fs/inode.c:667 __dentry_kill+0x20d/0x630 fs/dcache.c:603 dput+0x19f/0x2b0 fs/dcache.c:845 __fput+0x68c/0x8b0 fs/file_table.c:430 task_work_run+0x24f/0x310 kernel/task_work.c:180 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] exit_to_user_mode_loop kernel/entry/common.c:114 [inline] exit_to_user_mode_prepare include/linux/entry-common.h:328 [inline] __syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline] syscall_exit_to_user_mode+0x168/0x360 kernel/entry/common.c:218 do_syscall_64+0x100/0x230 arch/x86/entry/common.c:89 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f985a97579b Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 1c 48 8b 44 24 18 64 48 2b 04 25 28 00 00 RSP: 002b:00007ffe27dfe6b0 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: 0000000000000000 RBX: 0000000000000003 RCX: 00007f985a97579b RDX: 0000000000000000 RSI: 0000000000004c01 RDI: 0000000000000003 RBP: 00007ffe27dfe75c R08: 0000000000000000 R09: 00007ffe27dfe457 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000032 R13: 0000000000038870 R14: 0000000000037a0b R15: 00007ffe27dfe7c0 --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . From: Ekansh Gupta To: , CC: , , , , , Subject: [PATCH v1] misc: fastrpc: Add support for multiple PD from one process Date: Wed, 3 Jul 2024 12:22:00 +0530 Message-ID: <20240703065200.1438145-1-quic_ekangupt@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266105 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Memory intensive applications(which requires more tha 4GB) that wants to offload tasks to DSP might have to split the tasks to multiple user PD to make the resources available. For every call to DSP, fastrpc driver passes the process tgid which works as an identifier for the DSP to enqueue the tasks to specific PD. With current design, if any process opens device node more than once and makes PD init request, same tgid will be passed to DSP which will be considered a bad request and this will result in failure as the same identifier cannot be used for multiple DSP PD. Allocate and pass an effective pgid to DSP which would be allocated during device open and will have a lifetime till the device is closed. This will allow the same process to open the device more than once and spawn multiple dynamic PD for ease of processing. Signed-off-by: Ekansh Gupta --- drivers/misc/fastrpc.c | 48 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 5204fda51da3..7250e30aa93f 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -105,6 +105,10 @@ #define miscdev_to_fdevice(d) container_of(d, struct fastrpc_device, miscdev) +#define MAX_DSP_PD 64 +#define MIN_FRPC_PGID 1000 +#define MAX_FRPC_PGID (MIN_FRPC_PGID + MAX_DSP_PD) + static const char *domains[FASTRPC_DEV_MAX] = { "adsp", "mdsp", "sdsp", "cdsp"}; struct fastrpc_phy_page { @@ -268,6 +272,7 @@ struct fastrpc_channel_ctx { struct fastrpc_session_ctx session[FASTRPC_MAX_SESSIONS]; spinlock_t lock; struct idr ctx_idr; + struct ida dsp_pgid_ida; struct list_head users; struct kref refcount; /* Flag if dsp attributes are cached */ @@ -299,6 +304,7 @@ struct fastrpc_user { struct fastrpc_buf *init_mem; int tgid; + int dsp_pgid; int pd; bool is_secure_dev; /* Lock for lists */ @@ -462,6 +468,7 @@ static void fastrpc_channel_ctx_free(struct kref *ref) struct fastrpc_channel_ctx *cctx; cctx = container_of(ref, struct fastrpc_channel_ctx, refcount); + ida_destroy(&cctx->dsp_pgid_ida); kfree(cctx); } @@ -1114,7 +1121,7 @@ static int fastrpc_invoke_send(struct fastrpc_session_ctx *sctx, int ret; cctx = fl->cctx; - msg->pid = fl->tgid; + msg->pid = fl->dsp_pgid; msg->tid = current->pid; if (kernel) @@ -1292,7 +1299,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } } - inbuf.pgid = fl->tgid; + inbuf.pgid = fl->dsp_pgid; inbuf.namelen = init.namelen; inbuf.pageslen = 0; fl->pd = USER_PD; @@ -1394,7 +1401,7 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl, goto err; } - inbuf.pgid = fl->tgid; + inbuf.pgid = fl->dsp_pgid; inbuf.namelen = strlen(current->comm) + 1; inbuf.filelen = init.filelen; inbuf.pageslen = 1; @@ -1503,7 +1510,7 @@ static int fastrpc_release_current_dsp_process(struct fastrpc_user *fl) int tgid = 0; u32 sc; - tgid = fl->tgid; + tgid = fl->dsp_pgid; args[0].ptr = (u64)(uintptr_t) &tgid; args[0].length = sizeof(tgid); args[0].fd = -1; @@ -1528,6 +1535,9 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) list_del(&fl->user); spin_unlock_irqrestore(&cctx->lock, flags); + if (fl->dsp_pgid != -1) + ida_free(&cctx->dsp_pgid_ida, fl->dsp_pgid); + if (fl->init_mem) fastrpc_buf_free(fl->init_mem); @@ -1554,6 +1564,19 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) return 0; } +static int fastrpc_pgid_alloc(struct fastrpc_channel_ctx *cctx) +{ + int ret = -1; + + /* allocate unique id between MIN_FRPC_PGID and MAX_FRPC_PGID */ + ret = ida_alloc_range(&cctx->dsp_pgid_ida, MIN_FRPC_PGID, + MAX_FRPC_PGID, GFP_ATOMIC); + if (ret < 0) + return -1; + + return ret; +} + static int fastrpc_device_open(struct inode *inode, struct file *filp) { struct fastrpc_channel_ctx *cctx; @@ -1582,6 +1605,12 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) fl->cctx = cctx; fl->is_secure_dev = fdevice->secure; + fl->dsp_pgid = fastrpc_pgid_alloc(cctx); + if (fl->dsp_pgid == -1) { + dev_dbg(&cctx->rpdev->dev, "too many fastrpc clients, max %u allowed\n", MAX_DSP_PD); + return -EUSERS; + } + fl->sctx = fastrpc_session_alloc(cctx); if (!fl->sctx) { dev_err(&cctx->rpdev->dev, "No session available\n"); @@ -1646,7 +1675,7 @@ static int fastrpc_dmabuf_alloc(struct fastrpc_user *fl, char __user *argp) static int fastrpc_init_attach(struct fastrpc_user *fl, int pd) { struct fastrpc_invoke_args args[1]; - int tgid = fl->tgid; + int tgid = fl->dsp_pgid; u32 sc; args[0].ptr = (u64)(uintptr_t) &tgid; @@ -1802,7 +1831,7 @@ static int fastrpc_req_munmap_impl(struct fastrpc_user *fl, struct fastrpc_buf * int err; u32 sc; - req_msg.pgid = fl->tgid; + req_msg.pgid = fl->dsp_pgid; req_msg.size = buf->size; req_msg.vaddr = buf->raddr; @@ -1888,7 +1917,7 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) return err; } - req_msg.pgid = fl->tgid; + req_msg.pgid = fl->dsp_pgid; req_msg.flags = req.flags; req_msg.vaddr = req.vaddrin; req_msg.num = sizeof(pages); @@ -1978,7 +2007,7 @@ static int fastrpc_req_mem_unmap_impl(struct fastrpc_user *fl, struct fastrpc_me return -EINVAL; } - req_msg.pgid = fl->tgid; + req_msg.pgid = fl->dsp_pgid; req_msg.len = map->len; req_msg.vaddrin = map->raddr; req_msg.fd = map->fd; @@ -2031,7 +2060,7 @@ static int fastrpc_req_mem_map(struct fastrpc_user *fl, char __user *argp) return err; } - req_msg.pgid = fl->tgid; + req_msg.pgid = fl->dsp_pgid; req_msg.fd = req.fd; req_msg.offset = req.offset; req_msg.vaddrin = req.vaddrin; @@ -2375,6 +2404,7 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) INIT_LIST_HEAD(&data->invoke_interrupted_mmaps); spin_lock_init(&data->lock); idr_init(&data->ctx_idr); + ida_init(&data->dsp_pgid_ida); data->domain_id = domain_id; data->rpdev = rpdev; -- 2.34.1 . From: Kousik Sanagavarapu To: Julia Lawall , Nishanth Menon , Jonathan Cameron , Santosh Shilimkar , Nathan Chancellor Cc: Shuah Khan , Javier Carrasco , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kousik Sanagavarapu Subject: [PATCH v2 0/3] Do device node auto cleanup in drivers/soc/ti/ Date: Wed, 3 Jul 2024 12:25:25 +0530 Message-ID: <20240703065710.13786-1-five231003@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266107 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Do "struct device_node" auto cleanup in soc/ti/. This patch series takes care of all the cases where this is possible. v1: https://lore.kernel.org/linux-arm-kernel/20240510071432.62913-1-five231003@gmail.com/ Changes since v1: - Refactor code so that it the scope of the pointers touched is reduced, making the code look more clean. - The above also the side-effect of fixing the errors that clang emitted (but my local version of gcc didn't) for PATCH 2/3 during v1. Sorry for sending the v2 so late. I was busy with my semester exams. Kousik Sanagavarapu (3): soc: ti: pruss: do device_node auto cleanup soc: ti: knav_qmss_queue: do device_node auto cleanup soc: ti: pm33xx: do device_node auto cleanup drivers/soc/ti/knav_qmss_queue.c | 85 +++++++++------- drivers/soc/ti/pm33xx.c | 20 ++-- drivers/soc/ti/pruss.c | 168 ++++++++++++++----------------- 3 files changed, 131 insertions(+), 142 deletions(-) -- 2.45.2.561.g66ac6e4bcd . From: Luca Weiss Date: Wed, 03 Jul 2024 09:01:03 +0200 Subject: [PATCH] soc: qcom: socinfo: Add PM6350 PMIC X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240703-socinfo-pm6350-v1-1-e12369af3ed6@fairphone.com> To: Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266113 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.phone-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add the ID for the PM6350 PMIC found on e.g. SM7225 Fairphone 4. Signed-off-by: Luca Weiss --- drivers/soc/qcom/socinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index beb23e292323..d7359a235e3c 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -116,6 +116,7 @@ static const char *const pmic_models[] = { [50] = "PM8350B", [51] = "PMR735A", [52] = "PMR735B", + [54] = "PM6350", [55] = "PM4125", [58] = "PM8450", [65] = "PM8010", --- base-commit: 0b58e108042b0ed28a71cd7edf5175999955b233 change-id: 20240703-socinfo-pm6350-c27cfd02cb66 Best regards, -- Luca Weiss . From: Luca Weiss Date: Wed, 03 Jul 2024 09:03:01 +0200 Subject: [PATCH] arm64: dts: qcom: sm6350: Add missing qcom,non-secure-domain property X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240703-sm6350-fastrpc-fix-v1-1-9f127de17175@fairphone.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266115 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.phone-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail By default the DSP domains are non secure, add the missing qcom,non-secure-domain property to mark them as non-secure. Fixes: efc33c969f23 ("arm64: dts: qcom: sm6350: Add ADSP nodes") Fixes: 8eb5287e8a42 ("arm64: dts: qcom: sm6350: Add CDSP nodes") Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi index 46e122c4421c..8b9bff38e687 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -1323,6 +1323,7 @@ fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; label = "adsp"; + qcom,non-secure-domain; #address-cells = <1>; #size-cells = <0>; @@ -1582,6 +1583,7 @@ fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; label = "cdsp"; + qcom,non-secure-domain; #address-cells = <1>; #size-cells = <0>; --- base-commit: 0b58e108042b0ed28a71cd7edf5175999955b233 change-id: 20240703-sm6350-fastrpc-fix-760d2841d0b6 Best regards, -- Luca Weiss . X-Loopia-Auth: user X-Loopia-User: fredrik@frelon.se X-Loopia-Originating-IP: IPv6:2001:2042:34bd:7800:4e1d:96ff:fe79:894d From: =?UTF-8?q?Fredrik=20L=C3=B6nnegren?= To: Ping-Ke Shih , Kalle Valo Cc: =?UTF-8?q?Fredrik=20L=C3=B6nnegren?= , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wifi: rtlwifi: fix default typo Date: Wed, 3 Jul 2024 09:06:23 +0200 Message-ID: <20240703070627.135328-1-fredrik@frelon.se> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266118 org.kernel.vger.linux-wireless:85609 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Change 'defult' to 'default' in comments in several rtlwifi drivers. Signed-off-by: Fredrik Lönnegren --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c index 37bb59fa8bfa..35875cda30fc 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c @@ -27,7 +27,7 @@ static void rtl88e_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c index e20f2bec45c4..ce7c28d9c874 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c @@ -31,7 +31,7 @@ static void rtl92c_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 * */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c index 5f6311c2aac4..1b7a08315fc9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c @@ -32,7 +32,7 @@ static void rtl92d_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 * */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c index 7bde20fdbeab..162e734d5b08 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c @@ -31,7 +31,7 @@ static void rtl92ee_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c index 675bdd32feb1..bbf8ff63dced 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c @@ -27,7 +27,7 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 * */ rtlpci->const_pci_aspm = 2; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c index dd7505e2f22c..1b144fbd4d26 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c @@ -33,7 +33,7 @@ static void rtl8723e_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c index 162c34f0e9b7..0a92d0325098 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c @@ -32,7 +32,7 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c index 7b911695db33..a65503c5ae5a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c @@ -30,7 +30,7 @@ static void rtl8821ae_init_aspm_vars(struct ieee80211_hw *hw) * 2 - Enable ASPM with Clock Req, * 3 - Alwyas Enable ASPM with Clock Req, * 4 - Always Enable ASPM without Clock Req. - * set defult to RTL8192CE:3 RTL8192E:2 + * set default to RTL8192CE:3 RTL8192E:2 */ rtlpci->const_pci_aspm = 3; -- 2.45.2 . From: Youling Tang To: Kent Overstreet Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, youling.tang@linux.dev, Youling Tang Subject: [PATCH] bcachefs: Mark bch_inode_info as SLAB_ACCOUNT Date: Wed, 3 Jul 2024 15:09:55 +0800 Message-Id: <20240703070955.104163-1-youling.tang@linux.dev> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266121 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-bcachefs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Youling Tang After commit 230e9fc28604 ("slab: add SLAB_ACCOUNT flag"), we need to mark the inode cache as SLAB_ACCOUNT, similar to commit 5d097056c9a0 ("kmemcg: account for certain kmem allocations to memcg") Signed-off-by: Youling Tang --- fs/bcachefs/fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c index be7eda94b459..092f95426dce 100644 --- a/fs/bcachefs/fs.c +++ b/fs/bcachefs/fs.c @@ -2126,7 +2126,8 @@ int __init bch2_vfs_init(void) { int ret = -ENOMEM; - bch2_inode_cache = KMEM_CACHE(bch_inode_info, SLAB_RECLAIM_ACCOUNT); + bch2_inode_cache = KMEM_CACHE(bch_inode_info, SLAB_RECLAIM_ACCOUNT | + SLAB_ACCOUNT); if (!bch2_inode_cache) goto err; -- 2.34.1 . Return-Path: From: Nam Cao To: Thomas Gleixner , Paul Walmsley , Samuel Holland , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: b.spranger@linutronix.de, Nam Cao , Anup Patel , Christoph Hellwig , Marc Zyngier Subject: [PATCH] irqchip/sifive-plic: Fix plic_set_affinity() only enables 1 cpu Date: Wed, 3 Jul 2024 09:26:59 +0200 Message-Id: <20240703072659.1427616-1-namcao@linutronix.de> MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79313 org.kernel.vger.linux-kernel:1266124 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail plic_set_affinity() only enables interrupt for the first possible CPU in the mask. The point is to prevent all CPUs trying to claim an interrupt, but only one CPU succeeds and the other CPUs wasted some clock cycles for nothing. However, there are two problems with that: 1. Users cannot enable interrupt on multiple CPUs (for example, to minimize interrupt latency). 2. Even if users do not touch SMP interrupt affinity, plic_set_affinity() is still invoked once (in plic_irqdomain_map()). Thus, by default, only CPU0 handles interrupts from PLIC. That may overload CPU0. Considering this optimization is not strictly the best (it is tradeoff between CPU cycles and interrupt latency), it should not be forced on users. Rewrite plic_set_affinity() to enable interrupt for all possible CPUs in the mask. Before: $ cat /proc/interrupts CPU0 CPU1 CPU2 CPU3 10: 2538 2695 3080 2309 RISC-V INTC 5 Edge riscv-timer 12: 3 0 0 0 SiFive PLIC 111 Edge 17030000.power-controller 13: 1163 0 0 0 SiFive PLIC 25 Edge 13010000.spi 14: 60 0 0 0 SiFive PLIC 7 Edge end0 15: 0 0 0 0 SiFive PLIC 6 Edge end0 16: 0 0 0 0 SiFive PLIC 5 Edge end0 17: 0 0 0 0 SiFive PLIC 78 Edge end1 18: 0 0 0 0 SiFive PLIC 77 Edge end1 19: 0 0 0 0 SiFive PLIC 76 Edge end1 22: 796 0 0 0 SiFive PLIC 32 Edge ttyS0 23: 0 0 0 0 SiFive PLIC 38 Edge pl022 24: 9062 0 0 0 SiFive PLIC 75 Edge dw-mci 25: 0 0 0 0 SiFive PLIC 35 Edge 10030000.i2c 26: 0 0 0 0 SiFive PLIC 37 Edge 10050000.i2c 27: 1 0 0 0 SiFive PLIC 50 Edge 12050000.i2c 28: 0 0 0 0 SiFive PLIC 51 Edge 12060000.i2c IPI0: 118 98 88 138 Rescheduling interrupts IPI1: 2272 1910 3758 3200 Function call interrupts IPI2: 0 0 0 0 CPU stop interrupts IPI3: 0 0 0 0 CPU stop (for crash dump) interrupts IPI4: 0 0 0 0 IRQ work interrupts IPI5: 0 0 0 0 Timer broadcast interrupts After: $ cat /proc/interrupts CPU0 CPU1 CPU2 CPU3 10: 2539 2734 2295 2552 RISC-V INTC 5 Edge riscv-timer 12: 2 1 0 0 SiFive PLIC 111 Edge 17030000.power-controller 13: 643 194 368 75 SiFive PLIC 25 Edge 13010000.spi 14: 6 22 19 27 SiFive PLIC 7 Edge end0 15: 0 0 0 0 SiFive PLIC 6 Edge end0 16: 0 0 0 0 SiFive PLIC 5 Edge end0 17: 0 0 0 0 SiFive PLIC 78 Edge end1 18: 0 0 0 0 SiFive PLIC 77 Edge end1 19: 0 0 0 0 SiFive PLIC 76 Edge end1 22: 158 254 226 207 SiFive PLIC 32 Edge ttyS0 23: 0 0 0 0 SiFive PLIC 38 Edge pl022 24: 2265 2250 1452 2024 SiFive PLIC 75 Edge dw-mci 25: 0 0 0 0 SiFive PLIC 35 Edge 10030000.i2c 26: 0 0 0 0 SiFive PLIC 37 Edge 10050000.i2c 27: 0 0 0 1 SiFive PLIC 50 Edge 12050000.i2c 28: 0 0 0 0 SiFive PLIC 51 Edge 12060000.i2c IPI0: 92 118 116 120 Rescheduling interrupts IPI1: 4135 2653 2170 3160 Function call interrupts IPI2: 0 0 0 0 CPU stop interrupts IPI3: 0 0 0 0 CPU stop (for crash dump) interrupts IPI4: 0 0 0 0 IRQ work interrupts IPI5: 0 0 0 0 Timer broadcast interrupts Signed-off-by: Nam Cao Cc: Anup Patel Cc: Christoph Hellwig Cc: Marc Zyngier --- drivers/irqchip/irq-sifive-plic.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c index 9e22f7e378f5..f30bdb94ceeb 100644 --- a/drivers/irqchip/irq-sifive-plic.c +++ b/drivers/irqchip/irq-sifive-plic.c @@ -163,20 +163,19 @@ static void plic_irq_eoi(struct irq_data *d) static int plic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { - unsigned int cpu; struct plic_priv *priv = irq_data_get_irq_chip_data(d); + struct cpumask new_mask; - if (force) - cpu = cpumask_first_and(&priv->lmask, mask_val); - else - cpu = cpumask_first_and_and(&priv->lmask, mask_val, cpu_online_mask); + cpumask_and(&new_mask, mask_val, &priv->lmask); + if (!force) + cpumask_and(&new_mask, &new_mask, cpu_online_mask); - if (cpu >= nr_cpu_ids) + if (cpumask_empty(&new_mask)) return -EINVAL; plic_irq_disable(d); - irq_data_update_effective_affinity(d, cpumask_of(cpu)); + irq_data_update_effective_affinity(d, &new_mask); if (!irqd_irq_disabled(d)) plic_irq_enable(d); -- 2.39.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Dirk Behme , Geert Uytterhoeven , Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH] i2c: rcar: bring hardware to known state when probing Date: Wed, 3 Jul 2024 09:12:03 +0200 Message-ID: <20240703071625.5389-1-wsa+renesas@sang-engineering.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266126 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-i2c,org.kernel.vger.linux-renesas-soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Probably due to a lot of refactorization, the hardware was not brought into a known state in probe. This may be a problem when a hypervisor restarts Linux without resetting the hardware, leaving an old state running. Make sure the hardware gets initialized, especially interrupts should be cleared and disabled. Reported-by: Dirk Behme Reported-by: Geert Uytterhoeven Closes: https://lore.kernel.org/r/20240702045535.2000393-1-dirk.behme@de.bosch.com Signed-off-by: Wolfram Sang --- Here is my proposal to fix the issue reported by Dirk. Build tested. I can do proper testing on HW only tomorrow. But so you know already... It is strange to add another "_slave" function to the driver while I work on removing such language from I2C somewhere else. "Consistency" is the answer here. The driver will be converted as well. But then as a whole. drivers/i2c/busses/i2c-rcar.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 828aa2ea0fe4..00a885205075 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -257,6 +257,14 @@ static void rcar_i2c_init(struct rcar_i2c_priv *priv) } } +static void rcar_i2c_init_slave(struct rcar_i2c_priv *priv) +{ + rcar_i2c_write(priv, ICSIER, 0); + rcar_i2c_write(priv, ICSSR, 0); + rcar_i2c_write(priv, ICSCR, SDBS); + rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */ +} + static int rcar_i2c_bus_barrier(struct rcar_i2c_priv *priv) { int ret; @@ -1033,11 +1041,8 @@ static int rcar_unreg_slave(struct i2c_client *slave) /* ensure no irq is running before clearing ptr */ disable_irq(priv->irq); - rcar_i2c_write(priv, ICSIER, 0); - rcar_i2c_write(priv, ICSSR, 0); + rcar_i2c_init_slave(priv); enable_irq(priv->irq); - rcar_i2c_write(priv, ICSCR, SDBS); - rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */ priv->slave = NULL; @@ -1152,7 +1157,9 @@ static int rcar_i2c_probe(struct platform_device *pdev) goto out_pm_disable; } - rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */ + /* Bring hardware to known state */ + rcar_i2c_init(priv); + rcar_i2c_init_slave(priv); if (priv->devtype < I2C_RCAR_GEN3) { irqflags |= IRQF_NO_THREAD; -- 2.43.0 . From: Sascha Hauer To: linux-wireless@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Lin , Kalle Valo , Francesco Dolcini , Brian Norris , kernel@pengutronix.de, Sascha Hauer , Francesco Dolcini Subject: [PATCH] mwifiex: Do not return unused priv in mwifiex_get_priv_by_id() Date: Wed, 3 Jul 2024 09:24:09 +0200 Message-Id: <20240703072409.556618-1-s.hauer@pengutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266130 org.kernel.vger.linux-wireless:85613 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail mwifiex_get_priv_by_id() returns the priv pointer corresponding to the bss_num and bss_type, but without checking if the priv is actually currently in use. Unused priv pointers do not have a wiphy attached to them which can lead to NULL pointer dereferences further down the callstack. Fix this by returning only used priv pointers which have priv->bss_mode set to something else than NL80211_IFTYPE_UNSPECIFIED. Said NULL pointer dereference happened when an Accesspoint was started with wpa_supplicant -i mlan0 with this config: network={ ssid="somessid" mode=2 frequency=2412 key_mgmt=WPA-PSK WPA-PSK-SHA256 proto=RSN group=CCMP pairwise=CCMP psk="12345678" } When waiting for the AP to be established, interrupting wpa_supplicant with and starting it again this happens: | Unable to handle kernel NULL pointer dereference at virtual address 0000000000000140 | Mem abort info: | ESR = 0x0000000096000004 | EC = 0x25: DABT (current EL), IL = 32 bits | SET = 0, FnV = 0 | EA = 0, S1PTW = 0 | FSC = 0x04: level 0 translation fault | Data abort info: | ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 | CM = 0, WnR = 0, TnD = 0, TagAccess = 0 | GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 | user pgtable: 4k pages, 48-bit VAs, pgdp=0000000046d96000 | [0000000000000140] pgd=0000000000000000, p4d=0000000000000000 | Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP | Modules linked in: caam_jr caamhash_desc spidev caamalg_desc crypto_engine authenc libdes mwifiex_sdio +mwifiex crct10dif_ce cdc_acm onboard_usb_hub fsl_imx8_ddr_perf imx8m_ddrc rtc_ds1307 lm75 rtc_snvs +imx_sdma caam imx8mm_thermal spi_imx error imx_cpufreq_dt fuse ip_tables x_tables ipv6 | CPU: 0 PID: 8 Comm: kworker/0:1 Not tainted 6.9.0-00007-g937242013fce-dirty #18 | Hardware name: somemachine (DT) | Workqueue: events sdio_irq_work | pstate: 00000005 (nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : mwifiex_get_cfp+0xd8/0x15c [mwifiex] | lr : mwifiex_get_cfp+0x34/0x15c [mwifiex] | sp : ffff8000818b3a70 | x29: ffff8000818b3a70 x28: ffff000006bfd8a5 x27: 0000000000000004 | x26: 000000000000002c x25: 0000000000001511 x24: 0000000002e86bc9 | x23: ffff000006bfd996 x22: 0000000000000004 x21: ffff000007bec000 | x20: 000000000000002c x19: 0000000000000000 x18: 0000000000000000 | x17: 000000040044ffff x16: 00500072b5503510 x15: ccc283740681e517 | x14: 0201000101006d15 x13: 0000000002e8ff43 x12: 002c01000000ffb1 | x11: 0100000000000000 x10: 02e8ff43002c0100 x9 : 0000ffb100100157 | x8 : ffff000003d20000 x7 : 00000000000002f1 x6 : 00000000ffffe124 | x5 : 0000000000000001 x4 : 0000000000000003 x3 : 0000000000000000 | x2 : 0000000000000000 x1 : 0001000000011001 x0 : 0000000000000000 | Call trace: | mwifiex_get_cfp+0xd8/0x15c [mwifiex] | mwifiex_parse_single_response_buf+0x1d0/0x504 [mwifiex] | mwifiex_handle_event_ext_scan_report+0x19c/0x2f8 [mwifiex] | mwifiex_process_sta_event+0x298/0xf0c [mwifiex] | mwifiex_process_event+0x110/0x238 [mwifiex] | mwifiex_main_process+0x428/0xa44 [mwifiex] | mwifiex_sdio_interrupt+0x64/0x12c [mwifiex_sdio] | process_sdio_pending_irqs+0x64/0x1b8 | sdio_irq_work+0x4c/0x7c | process_one_work+0x148/0x2a0 | worker_thread+0x2fc/0x40c | kthread+0x110/0x114 | ret_from_fork+0x10/0x20 | Code: a94153f3 a8c37bfd d50323bf d65f03c0 (f940a000) | ---[ end trace 0000000000000000 ]--- Signed-off-by: Sascha Hauer Acked-by: Brian Norris Reviewed-by: Francesco Dolcini --- drivers/net/wireless/marvell/mwifiex/main.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index 175882485a195..c5164ae41b547 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -1287,6 +1287,9 @@ mwifiex_get_priv_by_id(struct mwifiex_adapter *adapter, for (i = 0; i < adapter->priv_num; i++) { if (adapter->priv[i]) { + if (adapter->priv[i]->bss_mode == NL80211_IFTYPE_UNSPECIFIED) + continue; + if ((adapter->priv[i]->bss_num == bss_num) && (adapter->priv[i]->bss_type == bss_type)) break; -- 2.39.2 . From: Vlastimil Babka To: linux-mm@kvack.org, David Rientjes , Christoph Lameter Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , Kees Cook , Alice Ryhl , Boqun Feng , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Vlastimil Babka Subject: [PATCH v2] slab, rust: extend kmalloc() alignment guarantees to remove Rust padding Date: Wed, 3 Jul 2024 09:25:21 +0200 Message-ID: <20240703072520.45837-2-vbabka@suse.cz> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266132 org.kvack.linux-mm:202321 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.rust-for-linux,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Slab allocators have been guaranteeing natural alignment for power-of-two sizes since commit 59bb47985c1d ("mm, sl[aou]b: guarantee natural alignment for kmalloc(power-of-two)"), while any other sizes are guaranteed to be aligned only to ARCH_KMALLOC_MINALIGN bytes (although in practice are aligned more than that in non-debug scenarios). Rust's allocator API specifies size and alignment per allocation, which have to satisfy the following rules, per Alice Ryhl [1]: 1. The alignment is a power of two. 2. The size is non-zero. 3. When you round up the size to the next multiple of the alignment, then it must not overflow the signed type isize / ssize_t. In order to map this to kmalloc()'s guarantees, some requested allocation sizes have to be padded to the next power-of-two size [2]. For example, an allocation of size 96 and alignment of 32 will be padded to an allocation of size 128, because the existing kmalloc-96 bucket doesn't guarantee alignent above ARCH_KMALLOC_MINALIGN. Without slab debugging active, the layout of the kmalloc-96 slabs however naturally align the objects to 32 bytes, so extending the size to 128 bytes is wasteful. To improve the situation we can extend the kmalloc() alignment guarantees in a way that 1) doesn't change the current slab layout (and thus does not increase internal fragmentation) when slab debugging is not active 2) reduces waste in the Rust allocator use case 3) is a superset of the current guarantee for power-of-two sizes. The extended guarantee is that alignment is at least the largest power-of-two divisor of the requested size. For power-of-two sizes the largest divisor is the size itself, but let's keep this case documented separately for clarity. For current kmalloc size buckets, it means kmalloc-96 will guarantee alignment of 32 bytes and kmalloc-196 will guarantee 64 bytes. This covers the rules 1 and 2 above of Rust's API as long as the size is a multiple of the alignment. The Rust layer should now only need to round up the size to the next multiple if it isn't, while enforcing the rule 3. Implementation-wise, this changes the alignment calculation in create_boot_cache(). While at it also do the calulation only for caches with the SLAB_KMALLOC flag, because the function is also used to create the initial kmem_cache and kmem_cache_node caches, where no alignment guarantee is necessary. In the Rust allocator's krealloc_aligned(), remove the code that padded sizes to the next power of two (suggested by Alice Ryhl) as it's no longer necessary with the new guarantees. Reported-by: Alice Ryhl Reported-by: Boqun Feng Link: https://lore.kernel.org/all/CAH5fLggjrbdUuT-H-5vbQfMazjRDpp2%2Bk3%3DYhPyS17ezEqxwcw@mail.gmail.com/ [1] Link: https://lore.kernel.org/all/CAH5fLghsZRemYUwVvhk77o6y1foqnCeDzW4WZv6ScEWna2+_jw@mail.gmail.com/ [2] Signed-off-by: Vlastimil Babka Reviewed-by: Boqun Feng Acked-by: Roman Gushchin --- v2: - add Rust side change as suggested by Alice, also thanks Boqun for fixups - clarify that the alignment already existed (unless debugging) but was not guaranteed, so there's no extra fragmentation in slab - add r-b, a-b thanks tO Boqun and Roman If it's fine with Rust folks, I can put this in the slab.git tree. Documentation/core-api/memory-allocation.rst | 6 ++++-- include/linux/slab.h | 3 ++- mm/slab_common.c | 9 +++++---- rust/kernel/alloc/allocator.rs | 19 ++++++------------- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/Documentation/core-api/memory-allocation.rst b/Documentation/core-api/memory-allocation.rst index 1c58d883b273..8b84eb4bdae7 100644 --- a/Documentation/core-api/memory-allocation.rst +++ b/Documentation/core-api/memory-allocation.rst @@ -144,8 +144,10 @@ configuration, but it is a good practice to use `kmalloc` for objects smaller than page size. The address of a chunk allocated with `kmalloc` is aligned to at least -ARCH_KMALLOC_MINALIGN bytes. For sizes which are a power of two, the -alignment is also guaranteed to be at least the respective size. +ARCH_KMALLOC_MINALIGN bytes. For sizes which are a power of two, the +alignment is also guaranteed to be at least the respective size. For other +sizes, the alignment is guaranteed to be at least the largest power-of-two +divisor of the size. Chunks allocated with kmalloc() can be resized with krealloc(). Similarly to kmalloc_array(): a helper for resizing arrays is provided in the form of diff --git a/include/linux/slab.h b/include/linux/slab.h index ed6bee5ec2b6..640cea6e6323 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -604,7 +604,8 @@ void *__kmalloc_large_node_noprof(size_t size, gfp_t flags, int node) * * The allocated object address is aligned to at least ARCH_KMALLOC_MINALIGN * bytes. For @size of power of two bytes, the alignment is also guaranteed - * to be at least to the size. + * to be at least to the size. For other sizes, the alignment is guaranteed to + * be at least the largest power-of-two divisor of @size. * * The @flags argument may be one of the GFP flags defined at * include/linux/gfp_types.h and described at diff --git a/mm/slab_common.c b/mm/slab_common.c index 1560a1546bb1..7272ef7bc55f 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -617,11 +617,12 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, s->size = s->object_size = size; /* - * For power of two sizes, guarantee natural alignment for kmalloc - * caches, regardless of SL*B debugging options. + * kmalloc caches guarantee alignment of at least the largest + * power-of-two divisor of the size. For power-of-two sizes, + * it is the size itself. */ - if (is_power_of_2(size)) - align = max(align, size); + if (flags & SLAB_KMALLOC) + align = max(align, 1U << (ffs(size) - 1)); s->align = calculate_alignment(flags, align, size); #ifdef CONFIG_HARDENED_USERCOPY diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs index 229642960cd1..e6ea601f38c6 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -18,23 +18,16 @@ pub(crate) unsafe fn krealloc_aligned(ptr: *mut u8, new_layout: Layout, flags: F // Customized layouts from `Layout::from_size_align()` can have size < align, so pad first. let layout = new_layout.pad_to_align(); - let mut size = layout.size(); - - if layout.align() > bindings::ARCH_SLAB_MINALIGN { - // The alignment requirement exceeds the slab guarantee, thus try to enlarge the size - // to use the "power-of-two" size/alignment guarantee (see comments in `kmalloc()` for - // more information). - // - // Note that `layout.size()` (after padding) is guaranteed to be a multiple of - // `layout.align()`, so `next_power_of_two` gives enough alignment guarantee. - size = size.next_power_of_two(); - } + // Note that `layout.size()` (after padding) is guaranteed to be a multiple of `layout.align()` + // which together with the slab guarantees means the `krealloc` will return a properly aligned + // object (see comments in `kmalloc()` for more information). + let size = layout.size(); // SAFETY: // - `ptr` is either null or a pointer returned from a previous `k{re}alloc()` by the // function safety requirement. - // - `size` is greater than 0 since it's either a `layout.size()` (which cannot be zero - // according to the function safety requirement) or a result from `next_power_of_two()`. + // - `size` is greater than 0 since it's from `layout.size()` (which cannot be zero according + // to the function safety requirement) unsafe { bindings::krealloc(ptr as *const core::ffi::c_void, size, flags.0) as *mut u8 } } -- 2.45.2 . From: Thorsten Blum To: ogabbay@kernel.org Cc: ttayar@habana.ai, obitton@habana.ai, fkassabri@habana.ai, dliberman@habana.ai, quic_carlv@quicinc.com, dhirschfeld@habana.ai, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thorsten Blum Subject: [RESEND PATCH] accel/habanalabs/gaudi2: Use kvfree() for memory allocated with kvcalloc() Date: Wed, 3 Jul 2024 09:24:39 +0200 Message-ID: <20240703072438.725114-2-thorsten.blum@toblux.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266134 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use kvfree() to fix the following Coccinelle/coccicheck warning reported by kfree_mismatch.cocci: WARNING kvmalloc is used to allocate this memory at line 10398 Reviewed-by: Tomer Tayar Signed-off-by: Thorsten Blum --- drivers/accel/habanalabs/gaudi2/gaudi2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/accel/habanalabs/gaudi2/gaudi2.c b/drivers/accel/habanalabs/gaudi2/gaudi2.c index fa1c4feb9f89..8024047962ec 100644 --- a/drivers/accel/habanalabs/gaudi2/gaudi2.c +++ b/drivers/accel/habanalabs/gaudi2/gaudi2.c @@ -10489,7 +10489,7 @@ static int gaudi2_memset_device_memory(struct hl_device *hdev, u64 addr, u64 siz (u64 *)(lin_dma_pkts_arr), DEBUGFS_WRITE64); WREG32(sob_addr, 0); - kfree(lin_dma_pkts_arr); + kvfree(lin_dma_pkts_arr); return rc; } -- 2.45.2 . From: Viresh Kumar To: "Rafael J. Wysocki" , Miguel Ojeda , Alex Gaynor , Alice Ryhl , Andreas Hindborg , Benno Lossin , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Boqun Feng , Gary Guo , Miguel Ojeda , Viresh Kumar , Wedson Almeida Filho Cc: linux-pm@vger.kernel.org, Vincent Guittot , Stephen Boyd , Nishanth Menon , rust-for-linux@vger.kernel.org, Manos Pitsidianakis , Erik Schilling , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Joakim Bech , Rob Herring , linux-kernel@vger.kernel.org Subject: [RFC PATCH V3 0/8] Rust bindings for cpufreq and OPP core + sample driver Date: Wed, 3 Jul 2024 12:44:25 +0530 Message-Id: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266135 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm,org.kernel.vger.rust-for-linux Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, This RFC adds initial rust bindings for two subsystems, cpufreq and operating performance points (OPP). The bindings are provided for most of the interface these subsystems expose. This series also provides a sample cpufreq driver rcpufreq-dt, which is a duplicate of the merged cpufreq-dt driver (A generic platform agnostic device tree based cpufreq driver) used on most of the ARM platforms. This is tested with the help of QEMU for now and frequency transitions, various configurations, driver binding/unbinding work as expected. No performance measurement is done with this. These patches (along with few other dependencies) are pushed here for anyone to give them a try: git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git rust/cpufreq-dt This depends on basic bindings for few other modules: device/driver, platform driver, OF, clk, and cpumask. I am not looking to upstream a full fledged support for them yet. Based on staging/rust-device from the Rust tree (which is based over v6.10-rc1). V2->V3: - Rebased on latest rust-device changes, which removed `Data` and so few changes were required to make it work. - use srctree links (Alice Ryhl). - Various changes the OPP creation APIs, new APIs: from_raw_opp() and from_raw_opp_owned() (Alice Ryhl). - Inline as_raw() helpers (Alice Ryhl). - Add new interface (`OPP::Token`) for dynamically created OPPs. - Add Reviewed-by tag from Manos. - Modified/simplified cpufreq registration structure / method a bit. V1->V2: - Create and use separate bindings for OF, clk, cpumask, etc (not included in this patchset but pushed to the above branch). This helped removing direct calls from the driver. - Fix wrong usage of Pinning + Vec. - Use Token for OPP Config. - Use Opaque, transparent and Aref for few structures. - Broken down into smaller patches to make it easy for reviewers. - Based over staging/rust-device. Thanks. *** BLURB HERE *** Viresh Kumar (8): rust: Add initial bindings for OPP framework rust: Extend OPP bindings for the OPP table rust: Extend OPP bindings for the configuration options rust: Add initial bindings for cpufreq framework rust: Extend cpufreq bindings for policy and driver ops rust: Extend cpufreq bindings for driver registration rust: Extend OPP bindings with CPU frequency table cpufreq: Add Rust based cpufreq-dt driver drivers/cpufreq/Kconfig | 12 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/rcpufreq_dt.rs | 225 +++++++ rust/bindings/bindings_helper.h | 2 + rust/helpers.c | 15 + rust/kernel/cpufreq.rs | 1041 +++++++++++++++++++++++++++++++ rust/kernel/lib.rs | 4 + rust/kernel/opp.rs | 918 +++++++++++++++++++++++++++ 8 files changed, 2218 insertions(+) create mode 100644 drivers/cpufreq/rcpufreq_dt.rs create mode 100644 rust/kernel/cpufreq.rs create mode 100644 rust/kernel/opp.rs -- 2.31.1.272.g89b43f80a514 . From: Petr Pavlu To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Petr Pavlu Subject: [PATCH v2] ring-buffer: Limit time with disabled interrupts in rb_check_pages() Date: Wed, 3 Jul 2024 09:53:14 +0200 Message-Id: <20240703075314.23511-1-petr.pavlu@suse.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266159 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The function rb_check_pages() validates the integrity of a specified per-CPU tracing ring buffer. It does so by traversing the underlying linked list and checking its next and prev links. To guarantee that the list isn't modified during the check, a caller typically needs to take cpu_buffer->reader_lock. This prevents the check from running concurrently, for example, with a potential reader which can make the list temporarily inconsistent when swapping its old reader page into the buffer. A problem with this approach is that the time when interrupts are disabled is non-deterministic, dependent on the ring buffer size. This particularly affects PREEMPT_RT because the reader_lock is a raw spinlock which doesn't become sleepable on PREEMPT_RT kernels. Modify the check so it still attempts to traverse the entire list, but gives up the reader_lock between checking individual pages. Introduce for this purpose a new variable ring_buffer_per_cpu.pages_era which is bumped any time the list is modified. The value is used by rb_check_pages() to detect such a change and restart the check. Signed-off-by: Petr Pavlu --- This is a follow-up to the discussion about improving this check [1]. Changes since v1 [2]: * Correct the case when rb_check_pages() is invoked concurrently with the resize code which modifies the list. Introduce ring_buffer_per_cpu.pages_era for this purpose. [1] https://lore.kernel.org/linux-trace-kernel/20240517134008.24529-1-petr.pavlu@suse.com/ [2] https://lore.kernel.org/linux-trace-kernel/20240621150956.24814-1-petr.pavlu@suse.com/ kernel/trace/ring_buffer.c | 97 ++++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 26 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 28853966aa9a..ff9a98c06043 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -462,6 +462,7 @@ struct ring_buffer_per_cpu { unsigned long nr_pages; unsigned int current_context; struct list_head *pages; + unsigned long pages_era; /* list state era */ struct buffer_page *head_page; /* read from head */ struct buffer_page *tail_page; /* write to tail */ struct buffer_page *commit_page; /* committed pages */ @@ -1454,40 +1455,87 @@ static void rb_check_bpage(struct ring_buffer_per_cpu *cpu_buffer, RB_WARN_ON(cpu_buffer, val & RB_FLAG_MASK); } +static bool rb_check_links(struct ring_buffer_per_cpu *cpu_buffer, + struct list_head *list) +{ + if (RB_WARN_ON(cpu_buffer, + rb_list_head(rb_list_head(list->next)->prev) != list)) + return false; + + if (RB_WARN_ON(cpu_buffer, + rb_list_head(rb_list_head(list->prev)->next) != list)) + return false; + + return true; +} + /** * rb_check_pages - integrity check of buffer pages * @cpu_buffer: CPU buffer with pages to test * * As a safety measure we check to make sure the data pages have not * been corrupted. - * - * Callers of this function need to guarantee that the list of pages doesn't get - * modified during the check. In particular, if it's possible that the function - * is invoked with concurrent readers which can swap in a new reader page then - * the caller should take cpu_buffer->reader_lock. */ static void rb_check_pages(struct ring_buffer_per_cpu *cpu_buffer) { - struct list_head *head = rb_list_head(cpu_buffer->pages); - struct list_head *tmp; + struct list_head *head, *tmp; + unsigned long pages_era; + unsigned long flags; + int nr_loops = 0; - if (RB_WARN_ON(cpu_buffer, - rb_list_head(rb_list_head(head->next)->prev) != head)) + /* + * Walk the linked list underpinning the ring buffer and validate all + * its next and prev links. + * + * The check acquires the reader_lock to avoid concurrent processing + * with code that could be modifying the list. However, the lock cannot + * be held for the entire duration of the walk, as this would make the + * time when interrupts are disabled non-deterministic, dependent on the + * ring buffer size. Therefore, the code releases and re-acquires the + * lock after checking each page. The pages_era variable is then used to + * detect if the list was modified while the lock was not held, in which + * case the check needs to be restarted. + * + * The code attempts to perform the check at most three times before + * giving up. This is acceptable because this is only a self-validation + * to detect problems early on. In practice, the list modification + * operations are fairly spaced, and so this check typically succeeds at + * most on the second try. + */ +again: + if (++nr_loops > 3) return; - if (RB_WARN_ON(cpu_buffer, - rb_list_head(rb_list_head(head->prev)->next) != head)) - return; + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); + head = rb_list_head(cpu_buffer->pages); + if (!rb_check_links(cpu_buffer, head)) + goto out_locked; + pages_era = cpu_buffer->pages_era; + tmp = head; + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); - for (tmp = rb_list_head(head->next); tmp != head; tmp = rb_list_head(tmp->next)) { - if (RB_WARN_ON(cpu_buffer, - rb_list_head(rb_list_head(tmp->next)->prev) != tmp)) - return; + while (true) { + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); - if (RB_WARN_ON(cpu_buffer, - rb_list_head(rb_list_head(tmp->prev)->next) != tmp)) - return; + if (pages_era != cpu_buffer->pages_era) { + /* The list was updated, try again. */ + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); + goto again; + } + + tmp = rb_list_head(tmp->next); + if (tmp == head) + /* The iteration circled back, all is done. */ + goto out_locked; + + if (!rb_check_links(cpu_buffer, tmp)) + goto out_locked; + + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); } + +out_locked: + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); } static int __rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer, @@ -1874,6 +1922,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) /* make sure pages points to a valid page in the ring buffer */ cpu_buffer->pages = next_page; + cpu_buffer->pages_era++; /* update head page */ if (head_bit) @@ -1980,6 +2029,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer) * pointer to point to end of list */ head_page->prev = last_page; + cpu_buffer->pages_era++; success = true; break; } @@ -2215,12 +2265,8 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size, */ synchronize_rcu(); for_each_buffer_cpu(buffer, cpu) { - unsigned long flags; - cpu_buffer = buffer->buffers[cpu]; - raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); rb_check_pages(cpu_buffer); - raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); } atomic_dec(&buffer->record_disabled); } @@ -4611,6 +4657,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) rb_list_head(reader->list.next)->prev = &cpu_buffer->reader_page->list; rb_inc_page(&cpu_buffer->head_page); + cpu_buffer->pages_era++; local_inc(&cpu_buffer->pages_read); /* Finally update the reader page to the new head */ @@ -5150,12 +5197,9 @@ void ring_buffer_read_finish(struct ring_buffer_iter *iter) { struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer; - unsigned long flags; /* Use this opportunity to check the integrity of the ring buffer. */ - raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); rb_check_pages(cpu_buffer); - raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); atomic_dec(&cpu_buffer->resize_disabled); kfree(iter->event); @@ -6050,6 +6094,7 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order) cpu_buffer->pages = cpu_buffer->new_pages.next; cpu_buffer->new_pages.next->prev = cpu_buffer->new_pages.prev; cpu_buffer->new_pages.prev->next = cpu_buffer->new_pages.next; + cpu_buffer->pages_era++; /* Clear the new_pages list */ INIT_LIST_HEAD(&cpu_buffer->new_pages); base-commit: 1dfe225e9af5bd3399a1dbc6a4df6a6041ff9c23 -- 2.35.3 . From: Krzysztof Kozlowski To: Davidlohr Bueso , Jonathan Cameron , Dave Jiang , Alison Schofield , Vishal Verma , Ira Weiny , Dan Williams , linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] cxl/acpi: simplify returning pointer without cleanup Date: Wed, 3 Jul 2024 10:30:55 +0200 Message-ID: <20240703083055.95864-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-cxl:29264 org.kernel.vger.linux-kernel:1266180 Newsgroups: org.kernel.vger.linux-cxl,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use 'return_ptr' helper for returning a pointer without cleanup for shorter code. Signed-off-by: Krzysztof Kozlowski --- drivers/cxl/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 571069863c62..1e4bed8a933e 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -339,7 +339,7 @@ static struct resource *alloc_cxl_resource(resource_size_t base, if (!res->name) return NULL; - return no_free_ptr(res); + return_ptr(res); } static int add_or_reset_cxl_resource(struct resource *parent, struct resource *res) -- 2.43.0 . From: Krzysztof Kozlowski To: Bartosz Golaszewski , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] power: sequencing: simplify returning pointer without cleanup Date: Wed, 3 Jul 2024 10:30:38 +0200 Message-ID: <20240703083038.95777-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266182 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use 'return_ptr' helper for returning a pointer without cleanup for shorter code. Signed-off-by: Krzysztof Kozlowski --- drivers/power/sequencing/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/sequencing/core.c b/drivers/power/sequencing/core.c index 9e606c9f6f04..9c32b07a55e7 100644 --- a/drivers/power/sequencing/core.c +++ b/drivers/power/sequencing/core.c @@ -687,7 +687,7 @@ struct pwrseq_desc *pwrseq_get(struct device *dev, const char *target) /* No device matched. */ return ERR_PTR(-EPROBE_DEFER); - return no_free_ptr(desc); + return_ptr(desc); } EXPORT_SYMBOL_GPL(pwrseq_get); -- 2.43.0 . From: Krzysztof Kozlowski To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] firmware: qcom: tzmem: simplify returning pointer without cleanup Date: Wed, 3 Jul 2024 10:30:46 +0200 Message-ID: <20240703083046.95811-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266183 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use 'return_ptr' helper for returning a pointer without cleanup for shorter code. Signed-off-by: Krzysztof Kozlowski --- drivers/firmware/qcom/qcom_tzmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 5d526753183d..ab156ab3a6b4 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -242,7 +242,7 @@ qcom_tzmem_pool_new(const struct qcom_tzmem_pool_config *config) } } - return no_free_ptr(pool); + return_ptr(pool); } EXPORT_SYMBOL_GPL(qcom_tzmem_pool_new); -- 2.43.0 . From: Krzysztof Kozlowski To: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] hwmon: (dell-smm) Simplify with cleanup.h Date: Wed, 3 Jul 2024 10:31:29 +0200 Message-ID: <20240703083129.95955-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266185 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-hwmon Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Allocate memory, which is being freed at end of the scope, to make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/hwmon/dell-smm-hwmon.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index 0362a13f6525..e72e26db6e10 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -1095,9 +1096,9 @@ static int dell_smm_init_cdev(struct device *dev, u8 fan_num) struct thermal_cooling_device *cdev; struct dell_smm_cooling_data *cdata; int ret = 0; - char *name; - name = kasprintf(GFP_KERNEL, "dell-smm-fan%u", fan_num + 1); + char *name __free(kfree) = kasprintf(GFP_KERNEL, "dell-smm-fan%u", + fan_num + 1); if (!name) return -ENOMEM; @@ -1115,8 +1116,6 @@ static int dell_smm_init_cdev(struct device *dev, u8 fan_num) ret = -ENOMEM; } - kfree(name); - return ret; } -- 2.43.0 . From: Krzysztof Kozlowski To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] thermal: constify 'type' in devm_thermal_of_cooling_device_register() Date: Wed, 3 Jul 2024 10:31:41 +0200 Message-ID: <20240703083141.96013-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266186 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The 'type' string passed to thermal_of_cooling_device_register() is a 'const char *', so make the same in the devm interface. Signed-off-by: Krzysztof Kozlowski --- drivers/thermal/thermal_core.c | 2 +- include/linux/thermal.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 3fb55060646e..4ea27dd25477 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1132,7 +1132,7 @@ static void thermal_cooling_device_release(struct device *dev, void *res) struct thermal_cooling_device * devm_thermal_of_cooling_device_register(struct device *dev, struct device_node *np, - char *type, void *devdata, + const char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { struct thermal_cooling_device **ptr, *tcd; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index f1155c0439c4..f732dab20368 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -261,7 +261,7 @@ thermal_of_cooling_device_register(struct device_node *np, const char *, void *, struct thermal_cooling_device * devm_thermal_of_cooling_device_register(struct device *dev, struct device_node *np, - char *type, void *devdata, + const char *type, void *devdata, const struct thermal_cooling_device_ops *ops); void thermal_cooling_device_update(struct thermal_cooling_device *); void thermal_cooling_device_unregister(struct thermal_cooling_device *); @@ -305,7 +305,7 @@ thermal_of_cooling_device_register(struct device_node *np, static inline struct thermal_cooling_device * devm_thermal_of_cooling_device_register(struct device *dev, struct device_node *np, - char *type, void *devdata, + const char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { return ERR_PTR(-ENODEV); -- 2.43.0 . From: Andreas Ziegler Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Ziegler Subject: [PATCH] libbpf: add NULL checks to bpf_object__{prev_map,next_map} Date: Wed, 3 Jul 2024 10:34:36 +0200 Message-Id: <20240703083436.505124-1-ziegler.andreas@siemens.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266191 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In the current state, an erroneous call to bpf_object__find_map_by_name(NULL, ...) leads to a segmentation fault through the following call chain: bpf_object__find_map_by_name(obj = NULL, ...) -> bpf_object__for_each_map(pos, obj = NULL) -> bpf_object__next_map((obj = NULL), NULL) -> return (obj = NULL)->maps While calling bpf_object__find_map_by_name with obj = NULL is obviously incorrect, this should not lead to a segmentation fault but rather be handled gracefully. As __bpf_map__iter already handles this situation correctly, we can delegate the check for the regular case there and only add a check in case the prev or next parameter is NULL. Signed-off-by: Andreas Ziegler --- tools/lib/bpf/libbpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 4a28fac4908a..30f121754d83 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -10375,7 +10375,7 @@ __bpf_map__iter(const struct bpf_map *m, const struct bpf_object *obj, int i) struct bpf_map * bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev) { - if (prev == NULL) + if (prev == NULL && obj != NULL) return obj->maps; return __bpf_map__iter(prev, obj, 1); @@ -10384,7 +10384,7 @@ bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev) struct bpf_map * bpf_object__prev_map(const struct bpf_object *obj, const struct bpf_map *next) { - if (next == NULL) { + if (next == NULL && obj != NULL) { if (!obj->nr_maps) return NULL; return obj->maps + obj->nr_maps - 1; -- 2.39.2 . From: Haoxiang Li To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, mikelley@microsoft.com, parri.andrea@gmail.com Cc: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li Subject: [PATCH v2] drivers: hv: vmbus: Add missing check for dma_set_mask in vmbus_device_register() Date: Wed, 3 Jul 2024 16:42:21 +0800 Message-Id: <20240703084221.12057-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266196 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-hyperv Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail child_device_obj->device cannot perform DMA properly if dma_set_mask() returns non-zero. Add check for dma_set_mask() and return the error if it fails. To do the right cleanup, call dma_set_mask() after device_register() so that we can use existent error path of vmbus_device_register(). Fixes: 3a5469582c24 ("Drivers: hv: vmbus: Fix initialization of device object in vmbus_device_register()") Signed-off-by: Haoxiang Li --- Changes in v2: Thanks for your comments. They help a lot. It is not sufficient to do the cleanup just with kfree(). The memory allocated by dev_set_name() should also be freed, which is done by put_device() (finally in kobject_cleanup() [1]). I think performing a complete cleanup within vmbus_device_register() would be verbose and detrimental to code maintenance. I suggest calling dma_set_mask() after device_register(), so that proper error handling can be achieved using the existent error path of vmbus_device_register(), i.e., err_dev_unregister [2]. Moreover, I found a similar usage in dmapool_checks() [3], which calls dma_set_mask_and_coherent() after device_register(). I believe the modification is workable. Reference link: [1]https://github.com/torvalds/linux/blob/master/lib/kobject.c#L695 [2]https://github.com/torvalds/linux/blob/master/drivers/hv/vmbus_drv.c#L1933 [3]https://github.com/torvalds/linux/blob/master/mm/dmapool_test.c#L105 --- drivers/hv/vmbus_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 12a707ab73f8..f3999d8afd77 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1897,7 +1897,6 @@ int vmbus_device_register(struct hv_device *child_device_obj) child_device_obj->device.dma_parms = &child_device_obj->dma_parms; child_device_obj->device.dma_mask = &child_device_obj->dma_mask; - dma_set_mask(&child_device_obj->device, DMA_BIT_MASK(64)); /* * Register with the LDM. This will kick off the driver/device @@ -1910,6 +1909,12 @@ int vmbus_device_register(struct hv_device *child_device_obj) return ret; } + ret = dma_set_mask(&child_device_obj->device, DMA_BIT_MASK(64)); + if (ret) { + pr_err("64-bit DMA enable failed!\n"); + goto err_dev_unregister; + } + child_device_obj->channels_kset = kset_create_and_add("channels", NULL, kobj); if (!child_device_obj->channels_kset) { -- 2.25.1 . From: Andrei Simion To: , , , , , , , , CC: , , , , Andrei Simion Subject: [PATCH v4 0/3] Read MAC address through NVMEM for sama7g5ek Date: Wed, 3 Jul 2024 11:47:01 +0300 Message-ID: <20240703084704.197697-1-andrei.simion@microchip.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266207 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-i2c Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Our main boot sequence : (1) ROM BOOT -> AT91Bootstrap -> U-Boot -> Linux Kernel. U-Boot is the stage where we set up the MAC address. Also we can skip U-Boot and use the following boot sequence : (2) ROM BOOT -> AT91Boostrap -> Linux Kernel. Add EEPROMs and nvmem-layout to describe eui48 MAC address region to be used for case (2). This series proposes to add EEPROM support and reading MAC addresses through NVMEM (via Devicetree) for sama7g5ek: - Add in DT bindings document the EEPROM compatibles : "microchip,24aa025e48" and "microchip,24aa025e64" - Update to the driver to support "microchip,24aa025e48" and "microchip,24aa025e64". - Added the nodes in devicetree for eeproms where are stored EUI-48 MAC, and update gmac nodes to read the MAC via devicetree through NVMEM. ----------------------------------------------------------------------- v3 -> v4: * dt-bindings: eeprom: at24: Add Microchip 24AA025E48/24AA025E64 - update the rule to select compatible * eeprom: at24: Add support for Microchip 24AA025E48/24AA025E64 EEPROMs - Use AT24_CHIP_DATA with AT24_FLAG_READONLY - drop AT24_CHIP_DATA_CB_AO - drop AT24_CHIP_DATA_AO - drop u8 adjoff - change commit message * ARM: dts: microchip: at91-sama7g5ek: add EEPROMs - reword commit message v2 -> v3: * dt-bindings: eeprom: at24: Add Microchip 24AA025E48/24AA025E64 - commit subject changed to reference Microchip 24AA025E48/24AA025E64 - drop the pattern: mac02e4$ and mac02e6$ and a-z from regex - add these two devices down at the bottom - added Reviewed-by * eeprom: at24: avoid adjusting offset for 24AA025E{48, 64} - add specific compatible names according with https://ww1.microchip.com/downloads/en/DeviceDoc/24AA02E48-24AA025E48-24AA02E64-24AA025E64-Data-Sheet-20002124H.pdf - add extended macros to initialize the structure with explicit value for adjoff - drop co-developed-by to maintain the commit history (chronological order of modifications) * ARM: dts: at91: at91-sama7g5ek: add EEPROMs - change from atmel,24mac02e4 to microchip,24aa025e48 to align with the datasheet - drop co-developed-by to maintain the chronological order of the changes v1 -> v2: * dt-bindings: eeprom: at24: Add at24,mac02e4 and at24,mac02e6 - change pattern into "^atmel,(24(c|cs|mac)[a-z0-9]+|spd)$" to keep simpler * eeprom: at24: avoid adjusting offset for 24AA025E{48, 64} - no change * ARM: dts: at91: at91-sama7g5ek: add EEPROMs - remove unnecessary #address-cells #size-cells ----------------------------------------------------------------------- Andrei Simion (1): dt-bindings: eeprom: at24: Add Microchip 24AA025E48/24AA025E64 Claudiu Beznea (2): eeprom: at24: Add support for Microchip 24AA025E48/24AA025E64 EEPROMs ARM: dts: microchip: at91-sama7g5ek: add EEPROMs .../devicetree/bindings/eeprom/at24.yaml | 8 +++- .../arm/boot/dts/microchip/at91-sama7g5ek.dts | 40 +++++++++++++++++++ drivers/misc/eeprom/at24.c | 8 ++++ 3 files changed, 55 insertions(+), 1 deletion(-) base-commit: 0b58e108042b0ed28a71cd7edf5175999955b233 -- 2.34.1 . From: Muhammad Qasim Abdul Majeed To: rafael@kernel.org, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Muhammad Qasim Abdul Majeed Subject: [PATCH v3] Updating a deprecated use of strcpy. Date: Wed, 3 Jul 2024 13:41:25 +0500 Message-Id: <20240703084124.11530-1-qasim.majeed20@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266211 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-acpi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Replacing strcpy with strscpy. strcpy is a deprecated function. It should be removed from the kernel source. Link: https://github.com/KSPP/linux/issues/88 Signed-off-by: Muhammad Qasim Abdul Majeed > Replacing strcpy with strscpy and memory bound the copy. > Why? In this particular case, it is not fundamentally necessary. > strcpy is a deprecated function. It should be removed from the kernel source. > If the goal is to get rid of all strcpy() calls from the kernel > because using it is generally unsafe, just say so in the changelog and > it will be fine. changelog has been updated. > So is it necessary to use the size argument here and below? Size argument is not necessary as destination is an array of 40 bytes. Patch has been updated. > for that to work, shouldn't the size of the *destination* buffer be > passed, instead of the length of the string we want to copy? Yes, size of the destination should be passed. > Not tested, but the 3rd argument of strscpy () is optional. > (https://elixir.bootlin.com/linux/v6.10-rc6/source/include/linux/string.h#L87), > so maybe just: > strscpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME); Thank you for sharing the reference, this suggestion will do the work and accomodated in the patch. --- v2 -> v3: Changelog has been updated. size argument has been removed. drivers/acpi/acpi_video.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c index 1fda30388297..8274a17872ed 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -1128,8 +1128,8 @@ static int acpi_video_bus_get_one_device(struct acpi_device *device, void *arg) return -ENOMEM; } - strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME); - strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS); + strscpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME); + strscpy(acpi_device_class(device), ACPI_VIDEO_CLASS); data->device_id = device_id; data->video = video; @@ -2010,8 +2010,8 @@ static int acpi_video_bus_add(struct acpi_device *device) } video->device = device; - strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME); - strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS); + strscpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME); + strscpy(acpi_device_class(device), ACPI_VIDEO_CLASS); device->driver_data = video; acpi_video_bus_find_cap(video); -- 2.34.1 . From: "Xin Li (Intel)" To: linux-kernel@vger.kernel.org Cc: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, peterz@infradead.org, andrew.cooper3@citrix.com, nik.borisov@suse.com, houwenlong.hwl@antgroup.com Subject: [PATCH v1 0/4] Enable FRED earlier Date: Wed, 3 Jul 2024 01:54:22 -0700 Message-ID: <20240703085426.274801-1-xin@zytor.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266218 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Wenlong Hou from Ant group reported two problems during the FRED initialization: https://lore.kernel.org/lkml/cover.1718972598.git.houwenlong.hwl@antgroup.com/ The first problem is that spurious_interrupt() gets called on the HYPERVISOR_CALLBACK_VECTOR vector. Because kvm_guest_init(), being executed way before trap_init() in which it is decided that whether FRED will be enabled or not, calls sysvec_install() to install HYPERVISOR_CALLBACK_VECTOR's interrupt handler into FRED system vector dispatch table or IDT depending on whether FRED is enabled. The other problem is that the #PF handler gets a wrong faulting address from the stack instead of CR2 before FRED is enabled. Because the #PF handler fetches its faulting addresss from the stack or CR2 based on whether FRED is available rather than active. This patchset fixes the 2 problems with suggestions from tglx: 1) Parse cmdline param "fred=" in cpu_parse_early_param() to minimize the gap mentioned above, before kvm_guest_init(). 2) Enable FRED right after init_mem_mapping() to switch to FRED from early IDT ASAP, avoid intermediately using the IDT #PF handler. Xin Li (Intel) (4): x86/fred: Parse cmdline param "fred=" in cpu_parse_early_param() x86/fred: Write to FRED MSRs with wrmsrns() x86/fred: Split FRED RSP initialization into a separate function x86/fred: Enable FRED right after init_mem_mapping() arch/x86/include/asm/fred.h | 2 ++ arch/x86/kernel/cpu/common.c | 9 ++++--- arch/x86/kernel/fred.c | 50 +++++++++++++++++++++--------------- arch/x86/kernel/setup.c | 7 ++++- arch/x86/kernel/smpboot.c | 6 +++++ arch/x86/kernel/traps.c | 30 +++------------------- 6 files changed, 54 insertions(+), 50 deletions(-) base-commit: e70c87e103e2e3842bf4c55a66c83560a1387925 -- 2.45.2 . From: Shengjiu Wang To: abelvesa@kernel.org, peng.fan@nxp.com, mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, imx@lists.linux.dev, shengjiu.wang@gmail.com Cc: linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] clk: imx: imx8: Add .name for "acm_aud_clk0_sel" and "acm_aud_clk1_sel" Date: Wed, 3 Jul 2024 16:52:51 +0800 Message-Id: <1719996771-11220-1-git-send-email-shengjiu.wang@nxp.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266228 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-clk Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail "acm_aud_clk0_sel" and "acm_aud_clk1_sel" are registered by this ACM driver, but they are the parent clocks for other clocks, in order to use assigned-clock-parents in device tree, they need to have the global name. Signed-off-by: Shengjiu Wang --- drivers/clk/imx/clk-imx8-acm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/imx/clk-imx8-acm.c b/drivers/clk/imx/clk-imx8-acm.c index 1bdb480cc96c..a1affcf6daff 100644 --- a/drivers/clk/imx/clk-imx8-acm.c +++ b/drivers/clk/imx/clk-imx8-acm.c @@ -114,8 +114,8 @@ static const struct clk_parent_data imx8qm_mclk_out_sels[] = { static const struct clk_parent_data imx8qm_mclk_sels[] = { { .fw_name = "aud_pll_div_clk0_lpcg_clk" }, { .fw_name = "aud_pll_div_clk1_lpcg_clk" }, - { .fw_name = "acm_aud_clk0_sel" }, - { .fw_name = "acm_aud_clk1_sel" }, + { .fw_name = "acm_aud_clk0_sel", .name = "acm_aud_clk0_sel" }, + { .fw_name = "acm_aud_clk1_sel", .name = "acm_aud_clk1_sel" }, }; static const struct clk_parent_data imx8qm_asrc_mux_clk_sels[] = { @@ -179,8 +179,8 @@ static const struct clk_parent_data imx8qxp_mclk_out_sels[] = { static const struct clk_parent_data imx8qxp_mclk_sels[] = { { .fw_name = "aud_pll_div_clk0_lpcg_clk" }, { .fw_name = "aud_pll_div_clk1_lpcg_clk" }, - { .fw_name = "acm_aud_clk0_sel" }, - { .fw_name = "acm_aud_clk1_sel" }, + { .fw_name = "acm_aud_clk0_sel", .name = "acm_aud_clk0_sel" }, + { .fw_name = "acm_aud_clk1_sel", .name = "acm_aud_clk1_sel" }, }; static struct clk_imx8_acm_sel imx8qxp_sels[] = { @@ -231,8 +231,8 @@ static const struct clk_parent_data imx8dxl_mclk_out_sels[] = { static const struct clk_parent_data imx8dxl_mclk_sels[] = { { .fw_name = "aud_pll_div_clk0_lpcg_clk" }, { .fw_name = "aud_pll_div_clk1_lpcg_clk" }, - { .fw_name = "acm_aud_clk0_sel" }, - { .fw_name = "acm_aud_clk1_sel" }, + { .fw_name = "acm_aud_clk0_sel", .name = "acm_aud_clk0_sel" }, + { .fw_name = "acm_aud_clk1_sel", .name = "acm_aud_clk1_sel" }, }; static struct clk_imx8_acm_sel imx8dxl_sels[] = { -- 2.34.1 . From: Varadarajan Narayanan To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 00/10] Enable CPR for IPQ9574 Date: Wed, 3 Jul 2024 14:46:41 +0530 Message-ID: <20240703091651.2820236-1-quic_varada@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266234 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series tries to enable CPR on IPQ9574, that implements CPRv4. Since [1] is older, faced few minor issues. Those are addressed in [2]. dt_binding_check and dtbs_check passed. Depends: [1] https://lore.kernel.org/lkml/20230217-topic-cpr3h-v14-0-9fd23241493d@linaro.org/T/ [2] https://github.com/quic-varada/cpr/tree/4de50be55a89eb29ab0d40d3fcfe9aa7a9ccf910 v4: s/cprh/cpr4/ Create new match data for ipq9574 that includes genpd_names Update cloop-vadj & oloop-vadj with minItems v3: Fix patch authorship for 2 patches Include CPR3 file changes done to Konrad's patches in https://github.com/quic-varada/cpr/commits/konrad/ Change url for [2] to skip the cpr3 file changes v2: Fix Signed-off-by order in 2 patches Update constraints in qcom,cpr3.yaml Add rbcpr_clk_src registration Add Reviewed-by to one of the patches Not adding Acked-by as the file has changed Praveenkumar I (2): pmdomain: qcom: rpmpd: Add IPQ9574 power domains soc: qcom: cpr3: Add IPQ9574 definitions Varadarajan Narayanan (8): soc: qcom: cpr3: Fix 'acc_desc' usage cpufreq: qcom-nvmem: Add support for IPQ9574 dt-bindings: power: rpmpd: Add IPQ9574 power domains dt-bindings: soc: qcom: cpr3: Add bindings for IPQ9574 dt-bindings: clock: Add CPR clock defines for IPQ9574 clk: qcom: gcc-ipq9574: Add CPR clock definition dt-bindings: opp: v2-qcom-level: Update minItems for oloop-vadj & cloop-vadj dts: arm64: qcom: ipq9574: Enable CPR .../bindings/opp/opp-v2-qcom-level.yaml | 2 + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + .../bindings/soc/qcom/qcom,cpr3.yaml | 35 +++ arch/arm64/boot/dts/qcom/ipq9574.dtsi | 269 ++++++++++++++++-- drivers/clk/qcom/gcc-ipq9574.c | 39 +++ drivers/cpufreq/qcom-cpufreq-nvmem.c | 7 +- drivers/pmdomain/qcom/cpr3.c | 147 +++++++++- drivers/pmdomain/qcom/rpmpd.c | 19 ++ include/dt-bindings/clock/qcom,ipq9574-gcc.h | 2 + include/dt-bindings/power/qcom-rpmpd.h | 3 + 10 files changed, 502 insertions(+), 22 deletions(-) -- 2.34.1 . From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Tejun Heo , Lai Jiangshan , Waiman Long Subject: [PATCH] workqueue: Always queue work items to the newest PWQ for order workqueues Date: Wed, 3 Jul 2024 17:27:41 +0800 Message-Id: <20240703092741.22997-1-jiangshanlai@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266252 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Lai Jiangshan To ensure non-reentrancy, __queue_work() attempts to enqueue a work item to the pool of the currently executing worker. This is not only unnecessary for an ordered workqueue, where order inherently suggests non-reentrancy, but it could also disrupt the sequence if the item is not enqueued on the newest PWQ. Just queue it to the newest PWQ and let order management guarantees non-reentrancy. Fixes: 4c065dbce1e8("workqueue: Enable unbound cpumask update on ordered workqueues") Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index c910f3c28664..d4fecd23ea44 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2271,9 +2271,13 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, * If @work was previously on a different pool, it might still be * running there, in which case the work needs to be queued on that * pool to guarantee non-reentrancy. + * + * For ordered workqueue, work items must be queued on the newest pwq + * for accurate order management. Guaranteed order also guarantees + * non-reentrancy. See the comments above unplug_oldest_pwq(). */ last_pool = get_work_pool(work); - if (last_pool && last_pool != pool) { + if (last_pool && last_pool != pool && !(wq->flags & __WQ_ORDERED)) { struct worker *worker; raw_spin_lock(&last_pool->lock); -- 2.19.1.6.gb485710b . From: Lorenzo Stoakes To: Andrew Morton Cc: lstoakes@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH] MAINTAINERS: mailmap: Update Lorenzo Stoakes's email address Date: Wed, 3 Jul 2024 10:27:04 +0100 Message-ID: <20240703092704.11571-1-lorenzo.stoakes@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266253 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Now working at Oracle. Signed-off-by: Lorenzo Stoakes --- .mailmap | 1 + MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index a6c619e22efc..81ac1e17ac3c 100644 --- a/.mailmap +++ b/.mailmap @@ -384,6 +384,7 @@ Li Yang Li Yang Lior David Lorenzo Pieralisi +Lorenzo Stoakes Luca Ceresoli Lukasz Luba Luo Jie diff --git a/MAINTAINERS b/MAINTAINERS index 098d214f78d9..cded71cc6362 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14475,7 +14475,7 @@ MEMORY MAPPING M: Andrew Morton R: Liam R. Howlett R: Vlastimil Babka -R: Lorenzo Stoakes +R: Lorenzo Stoakes L: linux-mm@kvack.org S: Maintained W: http://www.linux-mm.org -- 2.45.2 . From: Thorsten Blum To: bhe@redhat.com, vgoyal@redhat.com, dyoung@redhat.com Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Thorsten Blum Subject: [RESEND PATCH] crash: Remove duplicate included header Date: Wed, 3 Jul 2024 11:35:18 +0200 Message-ID: <20240703093517.730559-2-thorsten.blum@toblux.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266260 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.kexec Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Remove duplicate included header file linux/kexec.h Acked-by: Baoquan He Signed-off-by: Thorsten Blum --- kernel/crash_reserve.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/crash_reserve.c b/kernel/crash_reserve.c index 5b2722a93a48..d3b4cd12bdd1 100644 --- a/kernel/crash_reserve.c +++ b/kernel/crash_reserve.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include -- 2.45.2 . From: Krzysztof Kozlowski Subject: [PATCH 0/5] soc: qcom: simplify with cleanup.h Date: Wed, 03 Jul 2024 11:42:35 +0200 Message-Id: <20240703-thermal-const-v1-0-6e59e139c65d@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266267 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Allocate the memory with scoped/cleanup.h to reduce error handling (less error paths) and make the code a bit simpler. Best regards, Krzysztof --- Krzysztof Kozlowski (5): soc: qcom: llcc: simplify with cleanup.h soc: qcom: mdt_loader: simplify with cleanup.h soc: qcom: ocmem: simplify with cleanup.h soc: qcom: pdr: simplify with cleanup.h soc: qcom: wcnss: simplify with cleanup.h drivers/soc/qcom/llcc-qcom.c | 6 ++---- drivers/soc/qcom/mdt_loader.c | 6 ++---- drivers/soc/qcom/ocmem.c | 10 ++++------ drivers/soc/qcom/pdr_interface.c | 38 ++++++++++++++------------------------ drivers/soc/qcom/wcnss_ctrl.c | 11 +++++------ 5 files changed, 27 insertions(+), 44 deletions(-) --- base-commit: eec3a8b019937cc4520772df2657a8a105250e04 change-id: 20240703-thermal-const-7fb8e172c183 Best regards, -- Krzysztof Kozlowski . From: Javier Carrasco Subject: [PATCH 00/10] clk: constify struct regmap_config Date: Wed, 03 Jul 2024 11:50:13 +0200 Message-Id: <20240703-clk-const-regmap-v1-0-7d15a0671d6f@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Neil Armstrong , Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Vladimir Zapolskiy , Bjorn Andersson , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michal Simek Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-sunxi@lists.linux.dev, Javier Carrasco Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266279 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-sunxi,org.infradead.lists.linux-amlogic,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-clk Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series adds the const modifier to the remaining regmap_config structs within the clk subsystem that are effectively used as const (i.e., only read after their declaration), but kept ad writtable data. Signed-off-by: Javier Carrasco --- Javier Carrasco (10): clk: meson: a1: peripherals: Constify struct regmap_config clk: meson: a1: pll: Constify struct regmap_config clk: meson: c3: peripherals: Constify struct regmap_config clk: meson: c3: pll: Constify struct regmap_config clk: meson: s4: peripherals: Constify struct regmap_config clk: meson: s4: pll: Constify struct regmap_config clk: lpc32xx: Constify struct regmap_config clk: qcom: lpasscc-sc8280xp: Constify struct regmap_config clk: sunxi-ng r40: Constify struct regmap_config clk: xilinx: Constify struct regmap_config drivers/clk/meson/a1-peripherals.c | 2 +- drivers/clk/meson/a1-pll.c | 2 +- drivers/clk/meson/c3-peripherals.c | 2 +- drivers/clk/meson/c3-pll.c | 2 +- drivers/clk/meson/s4-peripherals.c | 2 +- drivers/clk/meson/s4-pll.c | 2 +- drivers/clk/nxp/clk-lpc32xx.c | 2 +- drivers/clk/qcom/lpasscc-sc8280xp.c | 4 ++-- drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 2 +- drivers/clk/xilinx/xlnx_vcu.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) --- base-commit: 0b58e108042b0ed28a71cd7edf5175999955b233 change-id: 20240703-clk-const-regmap-c9d56004dd06 Best regards, -- Javier Carrasco . From: Richard Fitzgerald To: CC: , , , Subject: [PATCH 0/2] ASoC: cs35l56: Set correct upper volume limit Date: Wed, 3 Jul 2024 10:55:15 +0100 Message-ID: <20240703095517.208077-1-rf@opensource.cirrus.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266292 Newsgroups: org.kernel.vger.linux-kernel,org.alsa-project.alsa-devel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail These two commits set the upper limit of the Speaker Volume control to +12dB instead of +100dB. This should have been a simple 1-line change to the #define in the header file, but only the HDA cs35l56 driver is using this define. The ASoC cs35l56 driver was using hardcoded numbers instead of the header defines. So the first commit changes the ASoC driver to use the #defined constants. The second commit corrects the value of the constant. Richard Fitzgerald (2): ASoC: cs35l56: Use header defines for Speaker Volume control definition ASoC: cs35l56: Limit Speaker Volume to +12dB maximum include/sound/cs35l56.h | 2 +- sound/soc/codecs/cs35l56.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) -- 2.39.2 . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Wed, 03 Jul 2024 02:56:23 -0700 Message-ID: <000000000000ce42b9061c54d76a@google.com> Subject: [syzbot] [wireless?] WARNING in rate_control_rate_init (3) From: syzbot To: davem@davemloft.net, edumazet@google.com, johannes@sipsolutions.net, kuba@kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266296 org.kernel.vger.linux-wireless:85619 org.kernel.vger.netdev:355519 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fa.. git tree: net-next console output: https://syzkaller.appspot.com/x/log.txt?x=17b17ab9980000 kernel config: https://syzkaller.appspot.com/x/.config?x=5264b58fdff6e881 dashboard link: https://syzkaller.appspot.com/bug?extid=9bdc0c5998ab45b05030 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/192a90a6425b/disk-ac263276.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/233fc7270a4e/vmlinux-ac263276.xz kernel image: https://storage.googleapis.com/syzbot-assets/585e26cc8536/bzImage-ac263276.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+9bdc0c5998ab45b05030@syzkaller.appspotmail.com ------------[ cut here ]------------ WARNING: CPU: 1 PID: 8730 at net/mac80211/rate.c:48 rate_control_rate_init+0x588/0x5f0 net/mac80211/rate.c:48 Modules linked in: CPU: 1 PID: 8730 Comm: syz.0.1096 Not tainted 6.10.0-rc5-syzkaller-01193-gac26327635d6 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/07/2024 RIP: 0010:rate_control_rate_init+0x588/0x5f0 net/mac80211/rate.c:48 Code: 00 00 00 e8 4a 75 01 f7 f0 41 80 8d 82 01 00 00 20 48 83 c4 20 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc e8 69 ad 9b f6 90 <0f> 0b 90 48 83 c4 20 5b 41 5c 41 5d 41 5e 41 5f 5d eb 65 89 e9 80 RSP: 0018:ffffc90004717058 EFLAGS: 00010283 RAX: ffffffff8afa79b7 RBX: ffff88802deceb98 RCX: 0000000000040000 RDX: ffffc90009d89000 RSI: 0000000000001518 RDI: 0000000000001519 RBP: 0000000000000001 R08: ffffffff8afa7622 R09: 1ffffffff25f78b0 R10: dffffc0000000000 R11: fffffbfff25f78b1 R12: ffff88802e488e20 R13: ffff88802a9c8000 R14: 1ffff1100553900a R15: 0000000000000000 FS: 00007f7083c2e6c0(0000) GS:ffff8880b9500000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f7082d5b420 CR3: 000000002df6e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: sta_apply_auth_flags+0x1b6/0x410 net/mac80211/cfg.c:1711 sta_apply_parameters+0xe23/0x1550 net/mac80211/cfg.c:2061 ieee80211_add_station+0x3da/0x630 net/mac80211/cfg.c:2127 rdev_add_station+0x11b/0x2b0 net/wireless/rdev-ops.h:201 nl80211_new_station+0x1d53/0x2550 net/wireless/nl80211.c:7683 genl_family_rcv_msg_doit net/netlink/genetlink.c:1115 [inline] genl_family_rcv_msg net/netlink/genetlink.c:1195 [inline] genl_rcv_msg+0xb14/0xec0 net/netlink/genetlink.c:1210 netlink_rcv_skb+0x1e3/0x430 net/netlink/af_netlink.c:2550 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1219 netlink_unicast_kernel net/netlink/af_netlink.c:1331 [inline] netlink_unicast+0x7f0/0x990 net/netlink/af_netlink.c:1357 netlink_sendmsg+0x8e4/0xcb0 net/netlink/af_netlink.c:1901 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0x221/0x270 net/socket.c:745 ____sys_sendmsg+0x525/0x7d0 net/socket.c:2585 ___sys_sendmsg net/socket.c:2639 [inline] __sys_sendmsg+0x2b0/0x3a0 net/socket.c:2668 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f7082d75b99 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f7083c2e048 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f7082f03f60 RCX: 00007f7082d75b99 RDX: 0000000000000000 RSI: 0000000020001080 RDI: 0000000000000003 RBP: 00007f7082de4a7a R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007f7082f03f60 R15: 00007fff740d84f8 --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . From: Francesco Dolcini To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Siddharth Vadapalli , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas Cc: Francesco Dolcini , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v1 0/2] PCI: ti: k3: Fix TI J721E PERST# polarity Date: Wed, 3 Jul 2024 12:00:34 +0200 Message-Id: <20240703100036.17896-1-francesco@dolcini.it> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266301 org.kernel.vger.linux-pci:144824 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-omap,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Francesco Dolcini Fix PCIe PERST# signal polarity in TI J721E used on TI K3 machines. PCIe PERST# needs to be de-asserted for PCIe to work, however, the driver is doing the opposite and the device tree files are defining the signal with the wrong polarity to cope with that. Fix both the driver and the affected DT files. Emanuele Ghidoli (2): arm64: dts: ti: Mark PCIe PERST# polarity active low in DT PCI: j721e: Fix PERST# polarity arch/arm64/boot/dts/ti/k3-am642-evm.dts | 2 +- arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 2 +- arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-sm.dts | 2 +- arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 2 +- arch/arm64/boot/dts/ti/k3-am69-sk.dts | 6 +++--- arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 2 +- arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 2 +- arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 6 +++--- arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 4 ++-- arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts | 2 +- arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 2 +- arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 4 ++-- drivers/pci/controller/cadence/pci-j721e.c | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) -- 2.39.2 . From: Shuijing Li To: , , , , , , CC: , , , , , Shuijing Li Subject: [PATCH v3] drm/mediatek: dsi: Add dsi per-frame lp code for mt8188 Date: Wed, 3 Jul 2024 18:01:05 +0800 Message-ID: <20240703100245.23188-1-shuijing.li@mediatek.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266306 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Adding the per-frame lp function of mt8188, which can keep HFP in HS and reduce the time required for each line to enter and exit low power. Per Frame LP: |<----------One Active Frame-------->| --______________________________________----___________________ ^HSA+HBP^^RGB^^HFP^^HSA+HBP^^RGB^^HFP^ ^HSA+HBP^^RGB^^HFP^ Per Line LP: |<---------------One Active Frame----------->| --______________--______________--______________----______________ ^HSA+HBP^^RGB^ ^HSA+HBP^^RGB^ ^HSA+HBP^^RGB^ ^HSA+HBP^^RGB^ Signed-off-by: Shuijing Li --- Changes in v3: Use function in bitfield.h and get value from phy timing, per suggestion from previous thread: https://patchwork.kernel.org/project/linux-mediatek/patch/20240424091639.22759-1-shuijing.li@mediatek.com/ Changes in v2: Use bitfield macros and add new function for per prame lp and improve the format, per suggestion from previous thread: https://patchwork.kernel.org/project/linux-mediatek/patch/20240314094238.3315-1-shuijing.li@mediatek.com/ --- drivers/gpu/drm/mediatek/mtk_dsi.c | 220 +++++++++++++++++++++++------ 1 file changed, 173 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index c255559cc56e..129ae17347a4 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -88,12 +88,19 @@ #define DSI_HSA_WC 0x50 #define DSI_HBP_WC 0x54 #define DSI_HFP_WC 0x58 +#define HFP_HS_EN 31 +#define HFP_HS_VB_PS_WC_SHIFT 16 + +#define DSI_BLLP_WC 0x5C +#define BLLP_WC GENMASK(11, 0) #define DSI_CMDQ_SIZE 0x60 #define CMDQ_SIZE 0x3f #define CMDQ_SIZE_SEL BIT(15) #define DSI_HSTX_CKL_WC 0x64 +#define HSTX_CKL_WC GENMASK(15, 2) +#define HSTX_CKL_WC_SHIFT 2 #define DSI_RX_DATA0 0x74 #define DSI_RX_DATA1 0x78 @@ -187,6 +194,7 @@ struct mtk_dsi_driver_data { bool has_shadow_ctl; bool has_size_ctl; bool cmdq_long_packet_ctl; + bool support_per_frame_lp; }; struct mtk_dsi { @@ -426,6 +434,119 @@ static void mtk_dsi_ps_control(struct mtk_dsi *dsi, bool config_vact) writel(ps_val, dsi->regs + DSI_PSCTRL); } +static void mtk_dsi_config_vdo_timing_per_frame_lp(struct mtk_dsi *dsi) +{ + u32 horizontal_sync_active_byte; + u32 horizontal_backporch_byte; + u32 horizontal_frontporch_byte; + u32 dsi_tmp_buf_bpp; + unsigned int lpx, da_hs_exit, da_hs_prep, da_hs_trail; + unsigned int da_hs_zero, ps_wc, hs_vb_ps_wc; + u32 bllp_wc, bllp_en, v_active_roundup, hstx_cklp_wc; + u32 hstx_cklp_wc_max, hstx_cklp_wc_min; + struct videomode *vm = &dsi->vm; + + if (dsi->format == MIPI_DSI_FMT_RGB565) + dsi_tmp_buf_bpp = 2; + else + dsi_tmp_buf_bpp = 3; + + da_hs_trail = dsi->phy_timing.da_hs_trail; + bllp_en = FIELD_GET(NULL_EN, readl(dsi->regs + DSI_TXRX_CTRL)); + ps_wc = FIELD_GET(DSI_PS_WC, readl(dsi->regs + DSI_PSCTRL)); + + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) { + horizontal_sync_active_byte = + vm->hsync_len * dsi_tmp_buf_bpp - 10; + horizontal_backporch_byte = + vm->hback_porch * dsi_tmp_buf_bpp - 10; + horizontal_frontporch_byte = + vm->hfront_porch * dsi_tmp_buf_bpp - 12; + + v_active_roundup = (32 + horizontal_sync_active_byte + + horizontal_backporch_byte + ps_wc + + horizontal_frontporch_byte) % dsi->lanes; + if (v_active_roundup) + horizontal_backporch_byte = horizontal_backporch_byte + + dsi->lanes - v_active_roundup; + hstx_cklp_wc_min = (DIV_ROUND_UP((12 + 2 + 4 + + horizontal_sync_active_byte), dsi->lanes) + da_hs_trail + 1) + * dsi->lanes / 6 - 1; + hstx_cklp_wc_max = (DIV_ROUND_UP((20 + 6 + 4 + + horizontal_sync_active_byte + horizontal_backporch_byte + + ps_wc), dsi->lanes) + da_hs_trail + 1) * dsi->lanes / 6 - 1; + } else { + horizontal_sync_active_byte = vm->hsync_len * dsi_tmp_buf_bpp - 4; + + horizontal_backporch_byte = (vm->hback_porch + vm->hsync_len) * + dsi_tmp_buf_bpp - 10; + hstx_cklp_wc_min = (DIV_ROUND_UP(4, dsi->lanes) + da_hs_trail + 1) + * dsi->lanes / 6 - 1; + + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) { + bllp_wc = FIELD_GET(BLLP_WC, readl(dsi->regs + DSI_BLLP_WC)); + horizontal_frontporch_byte = (vm->hfront_porch * + dsi_tmp_buf_bpp - 18); + + v_active_roundup = (28 + horizontal_backporch_byte + ps_wc + + horizontal_frontporch_byte + bllp_wc) % dsi->lanes; + if (v_active_roundup) + horizontal_backporch_byte = horizontal_backporch_byte + + dsi->lanes - v_active_roundup; + if (bllp_en) { + hstx_cklp_wc_max = (DIV_ROUND_UP((16 + 6 + 4 + + horizontal_backporch_byte + bllp_wc + ps_wc), + dsi->lanes) + da_hs_trail + 1) * dsi->lanes / 6 - 1; + } else { + hstx_cklp_wc_max = (DIV_ROUND_UP((12 + 4 + 4 + + horizontal_backporch_byte + bllp_wc + ps_wc), + dsi->lanes) + da_hs_trail + 1) * dsi->lanes / 6 - 1; + } + } else { + horizontal_frontporch_byte = (vm->hfront_porch * + dsi_tmp_buf_bpp - 12); + + v_active_roundup = (22 + horizontal_backporch_byte + ps_wc + + horizontal_frontporch_byte) % dsi->lanes; + if (v_active_roundup) + horizontal_backporch_byte = horizontal_backporch_byte + + dsi->lanes - v_active_roundup; + + hstx_cklp_wc_max = (DIV_ROUND_UP((12 + 4 + 4 + + horizontal_backporch_byte + ps_wc), + dsi->lanes) + da_hs_trail + 1) * dsi->lanes / 6 - 1; + } + } + hstx_cklp_wc = FIELD_GET(HSTX_CKL_WC, readl(dsi->regs + DSI_HSTX_CKL_WC)); + + if (hstx_cklp_wc <= hstx_cklp_wc_min || + hstx_cklp_wc >= hstx_cklp_wc_max) { + hstx_cklp_wc = ((hstx_cklp_wc_min + hstx_cklp_wc_max) / 2) << HSTX_CKL_WC_SHIFT; + writel(hstx_cklp_wc, dsi->regs + DSI_HSTX_CKL_WC); + } + hstx_cklp_wc = hstx_cklp_wc >> HSTX_CKL_WC_SHIFT; + if (hstx_cklp_wc <= hstx_cklp_wc_min || + hstx_cklp_wc >= hstx_cklp_wc_max) { + DRM_WARN("Wrong setting of hstx_ckl_wc\n"); + } + + lpx = dsi->phy_timing.lpx; + da_hs_exit = dsi->phy_timing.da_hs_exit; + da_hs_prep = dsi->phy_timing.da_hs_prepare; + da_hs_zero = dsi->phy_timing.da_hs_zero; + + hs_vb_ps_wc = ps_wc - + (lpx + da_hs_exit + da_hs_prep + da_hs_zero + 2) + * dsi->lanes; + horizontal_frontporch_byte = (1 << HFP_HS_EN) + | (hs_vb_ps_wc << HFP_HS_VB_PS_WC_SHIFT) + | (horizontal_frontporch_byte); + + writel(horizontal_sync_active_byte, dsi->regs + DSI_HSA_WC); + writel(horizontal_backporch_byte, dsi->regs + DSI_HBP_WC); + writel(horizontal_frontporch_byte, dsi->regs + DSI_HFP_WC); +} + static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi) { u32 horizontal_sync_active_byte; @@ -449,57 +570,61 @@ static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi) writel(vm->vfront_porch, dsi->regs + DSI_VFP_NL); writel(vm->vactive, dsi->regs + DSI_VACT_NL); - if (dsi->driver_data->has_size_ctl) - writel(FIELD_PREP(DSI_HEIGHT, vm->vactive) | - FIELD_PREP(DSI_WIDTH, vm->hactive), - dsi->regs + DSI_SIZE_CON); - - horizontal_sync_active_byte = (vm->hsync_len * dsi_tmp_buf_bpp - 10); - - if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) - horizontal_backporch_byte = vm->hback_porch * dsi_tmp_buf_bpp - 10; - else - horizontal_backporch_byte = (vm->hback_porch + vm->hsync_len) * - dsi_tmp_buf_bpp - 10; - - data_phy_cycles = timing->lpx + timing->da_hs_prepare + - timing->da_hs_zero + timing->da_hs_exit + 3; - - delta = dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST ? 18 : 12; - delta += dsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET ? 0 : 2; + if (dsi->driver_data->support_per_frame_lp) + mtk_dsi_config_vdo_timing_per_frame_lp(dsi); + else { + if (dsi->driver_data->has_size_ctl) + writel(FIELD_PREP(DSI_HEIGHT, vm->vactive) | + FIELD_PREP(DSI_WIDTH, vm->hactive), + dsi->regs + DSI_SIZE_CON); - horizontal_frontporch_byte = vm->hfront_porch * dsi_tmp_buf_bpp; - horizontal_front_back_byte = horizontal_frontporch_byte + horizontal_backporch_byte; - data_phy_cycles_byte = data_phy_cycles * dsi->lanes + delta; + horizontal_sync_active_byte = (vm->hsync_len * dsi_tmp_buf_bpp - 10); - if (horizontal_front_back_byte > data_phy_cycles_byte) { - horizontal_frontporch_byte -= data_phy_cycles_byte * - horizontal_frontporch_byte / - horizontal_front_back_byte; - - horizontal_backporch_byte -= data_phy_cycles_byte * - horizontal_backporch_byte / - horizontal_front_back_byte; - } else { - DRM_WARN("HFP + HBP less than d-phy, FPS will under 60Hz\n"); - } - - if ((dsi->mode_flags & MIPI_DSI_HS_PKT_END_ALIGNED) && - (dsi->lanes == 4)) { - horizontal_sync_active_byte = - roundup(horizontal_sync_active_byte, dsi->lanes) - 2; - horizontal_frontporch_byte = - roundup(horizontal_frontporch_byte, dsi->lanes) - 2; - horizontal_backporch_byte = - roundup(horizontal_backporch_byte, dsi->lanes) - 2; - horizontal_backporch_byte -= - (vm->hactive * dsi_tmp_buf_bpp + 2) % dsi->lanes; + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) + horizontal_backporch_byte = vm->hback_porch * dsi_tmp_buf_bpp - 10; + else + horizontal_backporch_byte = (vm->hback_porch + vm->hsync_len) * + dsi_tmp_buf_bpp - 10; + + data_phy_cycles = timing->lpx + timing->da_hs_prepare + + timing->da_hs_zero + timing->da_hs_exit + 3; + + delta = dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST ? 18 : 12; + delta += dsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET ? 0 : 2; + + horizontal_frontporch_byte = vm->hfront_porch * dsi_tmp_buf_bpp; + horizontal_front_back_byte = horizontal_frontporch_byte + horizontal_backporch_byte; + data_phy_cycles_byte = data_phy_cycles * dsi->lanes + delta; + + if (horizontal_front_back_byte > data_phy_cycles_byte) { + horizontal_frontporch_byte -= data_phy_cycles_byte * + horizontal_frontporch_byte / + horizontal_front_back_byte; + + horizontal_backporch_byte -= data_phy_cycles_byte * + horizontal_backporch_byte / + horizontal_front_back_byte; + } else { + DRM_WARN("HFP + HBP less than d-phy, FPS will under 60Hz\n"); + } + + if ((dsi->mode_flags & MIPI_DSI_HS_PKT_END_ALIGNED) && + (dsi->lanes == 4)) { + horizontal_sync_active_byte = + roundup(horizontal_sync_active_byte, dsi->lanes) - 2; + horizontal_frontporch_byte = + roundup(horizontal_frontporch_byte, dsi->lanes) - 2; + horizontal_backporch_byte = + roundup(horizontal_backporch_byte, dsi->lanes) - 2; + horizontal_backporch_byte -= + (vm->hactive * dsi_tmp_buf_bpp + 2) % dsi->lanes; + } + + writel(horizontal_sync_active_byte, dsi->regs + DSI_HSA_WC); + writel(horizontal_backporch_byte, dsi->regs + DSI_HBP_WC); + writel(horizontal_frontporch_byte, dsi->regs + DSI_HFP_WC); } - writel(horizontal_sync_active_byte, dsi->regs + DSI_HSA_WC); - writel(horizontal_backporch_byte, dsi->regs + DSI_HBP_WC); - writel(horizontal_frontporch_byte, dsi->regs + DSI_HFP_WC); - mtk_dsi_ps_control(dsi, false); } @@ -1194,6 +1319,7 @@ static const struct mtk_dsi_driver_data mt8188_dsi_driver_data = { .has_shadow_ctl = true, .has_size_ctl = true, .cmdq_long_packet_ctl = true, + .support_per_frame_lp = true, }; static const struct of_device_id mtk_dsi_of_match[] = { -- 2.43.0 . From: Tony Lindgren To: Jonathan Corbet , Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , linux-serial@vger.kernel.org, Tony Lindgren , Dhruva Gole , Sebastian Reichel , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 0/3] Add back DEVNAME:0.0 console handling Date: Wed, 3 Jul 2024 13:06:07 +0300 Message-ID: <20240703100615.118762-1-tony.lindgren@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266309 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-doc,org.kernel.vger.linux-serial Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi all, Here are the changes to add back the DEVNAME:0.0 style kernel command line console handling. The earlier attempt to add DEVNAME:0.0 style console handling caused a regression to the kernel command line console ordering, and we reverted the whole series. The fixes would have been too intrusive for the v6.10-rc series as discussed in [0] below. These patches are based on v6.10-rc6, and essentially the same as in [0]. Because of the rebase, I've left out Petr's Reviewed-by and Tested-by tags. Compared to the original DEVNAME:0.0 patch series [1], things are much simplified. We now have rewritten the printk deferred console handling thanks to Petr, and have renamed the serial functions accordingly. And as we are not deferring ttyS named consoles, the serial core console quirk handling been been left out. Regards, Tony [0] https://lore.kernel.org/linux-serial/20240620124541.164931-1-tony.lindgren@linux.intel.com/ [1] https://lore.kernel.org/linux-serial/20240327110021.59793-1-tony@atomide.com/ Tony Lindgren (3): printk: Add match_devname_and_update_preferred_console() serial: core: Add serial_base_match_and_update_preferred_console() Documentation: kernel-parameters: Add DEVNAME:0.0 format for serial ports .../admin-guide/kernel-parameters.txt | 19 ++++ drivers/tty/serial/serial_base.h | 16 +++ drivers/tty/serial/serial_base_bus.c | 37 +++++++ drivers/tty/serial/serial_core.c | 4 + include/linux/printk.h | 4 + kernel/printk/console_cmdline.h | 1 + kernel/printk/printk.c | 103 +++++++++++++++--- 7 files changed, 169 insertions(+), 15 deletions(-) base-commit: 22a40d14b572deb80c0648557f4bd502d7e83826 -- 2.45.2 . From: Hongyan Xia To: Tejun Heo Cc: linux-kernel@vger.kernel.org Subject: [PATCH 0/2] Move uclamp to each sched_class Date: Wed, 3 Jul 2024 11:07:46 +0100 Message-Id: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266314 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi. I only just started looking at sched_ext a couple of days ago so feel free to correct me if sched_ext patches have different rules, different cc's and different mailing lists than normal LKML. This mini series delegates uclamp operations to each sched_class. The problem with the current handling of uclamp is that it seems to be a global thing but it conditions on sched_class->uclamp_enabled anyway, so it is in fact already kind of sched_class-specific. So, remove sched_class->uclamp_enabled and just let each class decide what to do. More importantly, sched_ext no longer unconditionally follows the existing uclamp implementation, but instead each custom scheduler decides itself what to do. It can re-use the existing uclamp, ignore uclamp completely, or have its own uclamp implementation. Some simple testing with trace_printk() shows uclamp_rq_{inc,dec}() are called successfully from a sched_ext scheduler: [002] d..21 1016.017441: uclamp_rq_dec: sched_ext uclamp dec [002] dN.21 1016.017456: uclamp_rq_inc: sched_ext uclamp inc Hongyan Xia (2): sched/uclamp: Delegate uclamp to each sched_class sched/ext: Add BPF functions for uclamp inc and dec kernel/sched/core.c | 14 ++------------ kernel/sched/ext.c | 16 ++++++++++++---- kernel/sched/fair.c | 6 ++---- kernel/sched/rt.c | 7 +++---- kernel/sched/sched.h | 15 +++++++++++---- tools/sched_ext/include/scx/common.bpf.h | 2 ++ 6 files changed, 32 insertions(+), 28 deletions(-) -- 2.34.1 . From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner , Guo Ren Subject: [PATCH v12 00/19] tracing: fprobe: function_graph: Multi-function graph and fprobe on fgraph Date: Wed, 3 Jul 2024 19:09:04 +0900 Message-Id: <172000134410.63468.13742222887213469474.stgit@devnote2> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266318 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, Here is the 12th version of the series to re-implement the fprobe on function-graph tracer. The previous version is; https://lore.kernel.org/all/171858878797.288820.237119113242007537.stgit@devnote2/ In this version, I added a new performance improvement patch[19/19] and add some performance numbers to [18/19]. Here is the final result of this change. NOTE: I used tools/testing/selftests/bpf/benchs/run_bench_trigger.sh, so kprobe-multi is fprobe entry_handker, kretprobe-multi is fprobe exit_handler. Without this series: kprobe-multi : 6.507 ± 0.065M/s kretprobe-multi: 3.518 ± 0.002M/s With this series: kprobe-multi : 6.377 ± 0.054M/s -2.00% kretprobe-multi: 4.815 ± 0.007M/s *36.87% So the fprobe entry_handler performance is 2% down, but exit_handler performance is 37% better. Overview -------- This series rewrites the fprobe on this function-graph. The purposes of this change are; 1) Remove dependency of the rethook from fprobe so that we can reduce the return hook code and shadow stack. 2) Make 'ftrace_regs' the common trace interface for the function boundary. 1) Currently we have 2(or 3) different function return hook codes, the function-graph tracer and rethook (and legacy kretprobe). But since this is redundant and needs double maintenance cost, I would like to unify those. From the user's viewpoint, function- graph tracer is very useful to grasp the execution path. For this purpose, it is hard to use the rethook in the function-graph tracer, but the opposite is possible. (Strictly speaking, kretprobe can not use it because it requires 'pt_regs' for historical reasons.) 2) Now the fprobe provides the 'pt_regs' for its handler, but that is wrong for the function entry and exit. Moreover, depending on the architecture, there is no way to accurately reproduce 'pt_regs' outside of interrupt or exception handlers. This means fprobe should not use 'pt_regs' because it does not use such exceptions. (Conversely, kprobe should use 'pt_regs' because it is an abstract interface of the software breakpoint exception.) This series changes fprobe to use function-graph tracer for tracing function entry and exit, instead of mixture of ftrace and rethook. Unlike the rethook which is a per-task list of system-wide allocated nodes, the function graph's ret_stack is a per-task shadow stack. Thus it does not need to set 'nr_maxactive' (which is the number of pre-allocated nodes). Also the handlers will get the 'ftrace_regs' instead of 'pt_regs'. Since eBPF mulit_kprobe/multi_kretprobe events still use 'pt_regs' as their register interface, this changes it to convert 'ftrace_regs' to 'pt_regs'. Of course this conversion makes an incomplete 'pt_regs', so users must access only registers for function parameters or return value. Design ------ Instead of using ftrace's function entry hook directly, the new fprobe is built on top of the function-graph's entry and return callbacks with 'ftrace_regs'. Since the fprobe requires access to 'ftrace_regs', the architecture must support CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS and CONFIG_HAVE_FTRACE_GRAPH_FUNC, which enables to call function-graph entry callback with 'ftrace_regs', and also CONFIG_HAVE_FUNCTION_GRAPH_FREGS, which passes the ftrace_regs to return_to_handler. All fprobes share a single function-graph ops (means shares a common ftrace filter) similar to the kprobe-on-ftrace. This needs another layer to find corresponding fprobe in the common function-graph callbacks, but has much better scalability, since the number of registered function-graph ops is limited. In the entry callback, the fprobe runs its entry_handler and saves the address of 'fprobe' on the function-graph's shadow stack as data. The return callback decodes the data to get the 'fprobe' address, and runs the exit_handler. The fprobe introduces two hash-tables, one is for entry callback which searches fprobes related to the given function address passed by entry callback. The other is for a return callback which checks if the given 'fprobe' data structure pointer is still valid. Note that it is possible to unregister fprobe before the return callback runs. Thus the address validation must be done before using it in the return callback. Download -------- This series can be applied against the ftrace/for-next branch in linux-trace tree. This series can also be found below branch. https://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux.git/log/?h=topic/fprobe-on-fgraph Thank you, --- Masami Hiramatsu (Google) (19): tracing: Add a comment about ftrace_regs definition tracing: Rename ftrace_regs_return_value to ftrace_regs_get_return_value function_graph: Pass ftrace_regs to entryfunc function_graph: Replace fgraph_ret_regs with ftrace_regs function_graph: Pass ftrace_regs to retfunc fprobe: Use ftrace_regs in fprobe entry handler fprobe: Use ftrace_regs in fprobe exit handler tracing: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs tracing: Add ftrace_fill_perf_regs() for perf event tracing/fprobe: Enable fprobe events with CONFIG_DYNAMIC_FTRACE_WITH_ARGS bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled ftrace: Add CONFIG_HAVE_FTRACE_GRAPH_FUNC fprobe: Rewrite fprobe on function-graph tracer tracing/fprobe: Remove nr_maxactive from fprobe selftests: ftrace: Remove obsolate maxactive syntax check selftests/ftrace: Add a test case for repeating register/unregister fprobe Documentation: probes: Update fprobe on function-graph tracer fgraph: Skip recording calltime/rettime if it is not nneeded fgraph: Skip push operation if no retfunc is registered Documentation/trace/fprobe.rst | 42 + arch/arm64/Kconfig | 3 arch/arm64/include/asm/ftrace.h | 47 + arch/arm64/kernel/asm-offsets.c | 12 arch/arm64/kernel/entry-ftrace.S | 32 + arch/arm64/kernel/ftrace.c | 20 + arch/loongarch/Kconfig | 4 arch/loongarch/include/asm/ftrace.h | 32 - arch/loongarch/kernel/asm-offsets.c | 12 arch/loongarch/kernel/ftrace_dyn.c | 10 arch/loongarch/kernel/mcount.S | 17 - arch/loongarch/kernel/mcount_dyn.S | 14 arch/powerpc/Kconfig | 1 arch/powerpc/include/asm/ftrace.h | 15 arch/powerpc/kernel/trace/ftrace.c | 2 arch/powerpc/kernel/trace/ftrace_64_pg.c | 10 arch/riscv/Kconfig | 3 arch/riscv/include/asm/ftrace.h | 26 - arch/riscv/kernel/ftrace.c | 17 - arch/riscv/kernel/mcount.S | 24 - arch/s390/Kconfig | 3 arch/s390/include/asm/ftrace.h | 39 + arch/s390/kernel/asm-offsets.c | 6 arch/s390/kernel/mcount.S | 9 arch/x86/Kconfig | 4 arch/x86/include/asm/ftrace.h | 37 - arch/x86/kernel/ftrace.c | 50 +- arch/x86/kernel/ftrace_32.S | 15 arch/x86/kernel/ftrace_64.S | 17 - include/linux/fprobe.h | 57 +- include/linux/ftrace.h | 137 ++++ kernel/trace/Kconfig | 23 + kernel/trace/bpf_trace.c | 19 - kernel/trace/fgraph.c | 119 +++- kernel/trace/fprobe.c | 661 +++++++++++++++----- kernel/trace/ftrace.c | 6 kernel/trace/trace.h | 6 kernel/trace/trace_fprobe.c | 147 ++-- kernel/trace/trace_functions_graph.c | 10 kernel/trace/trace_irqsoff.c | 6 kernel/trace/trace_probe_tmpl.h | 2 kernel/trace/trace_sched_wakeup.c | 6 kernel/trace/trace_selftest.c | 11 lib/test_fprobe.c | 51 -- samples/fprobe/fprobe_example.c | 4 .../test.d/dynevent/add_remove_fprobe_repeat.tc | 19 + .../ftrace/test.d/dynevent/fprobe_syntax_errors.tc | 4 47 files changed, 1190 insertions(+), 621 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe_repeat.tc -- Masami Hiramatsu (Google) . Return-Path: From: WangYuli To: kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me, guanwentao@uniontech.com, huanglin@uniontech.com Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, WangYuli Subject: [PATCH v2] nvme/pci: Add DEEPEST_PS quirk for Lenovo N60z laptop Date: Wed, 3 Jul 2024 18:15:13 +0800 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-nvme:61648 org.kernel.vger.linux-kernel:1266342 Newsgroups: org.infradead.lists.linux-nvme,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail There is a hardware power-saving problem with the Lenovo N60z board. When turn it on and leave it for 30 minutes, there is a 20% chance that a nvme disk will not wake up until reboot. Signed-off-by: hmy Signed-off-by: Wentao Guan Signed-off-by: WangYuli --- drivers/nvme/host/pci.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 282d808400c5..4c840d468fce 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2903,6 +2903,13 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) return NVME_QUIRK_SIMPLE_SUSPEND; } + /* + * NVMe SSD drops off the PCIe bus after system idle + * for 30 minuites on a Lenovo N60z board. + */ + if (dmi_match(DMI_BOARD_NAME, "LXKT-ZXEG-N6")) + return NVME_QUIRK_NO_DEEPEST_PS; + return 0; } -- 2.43.4 . From: Krzysztof Kozlowski Subject: [PATCH 0/9] soundwire: simplify code with cleanup.h Date: Wed, 03 Jul 2024 12:15:52 +0200 Message-Id: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266343 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Allocate the memory with scoped/cleanup.h to reduce error handling (simpler error paths) and make the code a bit smaller. Best regards, Krzysztof --- Krzysztof Kozlowski (9): soundwire: amd: simplify return path in hw_params soundwire: amd: simplify with cleanup.h soundwire: amd_init: simplify with cleanup.h soundwire: intel: simplify return path in hw_params soundwire: intel: simplify with cleanup.h soundwire: intel_ace2x: simplify return path in hw_params soundwire: intel_ace2x: simplify with cleanup.h soundwire: cadence: simplify with cleanup.h soundwire: debugfs: simplify with cleanup.h drivers/soundwire/amd_init.c | 7 +++---- drivers/soundwire/amd_manager.c | 13 +++++-------- drivers/soundwire/cadence_master.c | 5 ++--- drivers/soundwire/debugfs.c | 7 ++----- drivers/soundwire/intel.c | 25 +++++++++---------------- drivers/soundwire/intel_ace2x.c | 22 ++++++++-------------- 6 files changed, 29 insertions(+), 50 deletions(-) --- base-commit: 246cf92bafedeea46cb16964d16478d6b68f8e5a change-id: 20240703-soundwire-cleanup-h-a29941fb3dd4 Best regards, -- Krzysztof Kozlowski . From: WangYuli To: kuba@kernel.org, kvalo@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, guanwentao@uniontech.com, sergio.it.consultant@gmail.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, WangYuli Subject: [PATCH] drivers/mediatek: Fix some mt7601u vendor could not connect Date: Wed, 3 Jul 2024 18:20:31 +0800 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266356 org.kernel.vger.linux-wireless:85640 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Some mt7601 devices cannot establish a connection properly. This patch fixes the issue. We do not know why, but it just works. Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1716301/comments/52 Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1716301/comments/53 Link: https://github.com/kuba-moo/mt7601u/issues/64 Link: https://www.mediatek.com/products/broadband-wifi/mt7601u Signed-off-by: Wentao Guan Signed-off-by: WangYuli --- drivers/net/wireless/mediatek/mt7601u/mcu.c | 1 - drivers/net/wireless/mediatek/mt7601u/phy.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt7601u/mcu.c b/drivers/net/wireless/mediatek/mt7601u/mcu.c index 1b5cc271a9e1..15751d11b4dc 100644 --- a/drivers/net/wireless/mediatek/mt7601u/mcu.c +++ b/drivers/net/wireless/mediatek/mt7601u/mcu.c @@ -446,7 +446,6 @@ static int mt7601u_load_firmware(struct mt7601u_dev *dev) mt7601u_wr(dev, 0x94c, 0); mt7601u_wr(dev, MT_FCE_PSE_CTRL, 0); - mt7601u_vendor_reset(dev); msleep(5); mt7601u_wr(dev, 0xa44, 0); diff --git a/drivers/net/wireless/mediatek/mt7601u/phy.c b/drivers/net/wireless/mediatek/mt7601u/phy.c index d4cd2215aba9..f3c14a1552df 100644 --- a/drivers/net/wireless/mediatek/mt7601u/phy.c +++ b/drivers/net/wireless/mediatek/mt7601u/phy.c @@ -589,8 +589,6 @@ void mt7601u_phy_recalibrate_after_assoc(struct mt7601u_dev *dev) if (test_bit(MT7601U_STATE_REMOVED, &dev->state)) return; - mt7601u_mcu_calibrate(dev, MCU_CAL_DPD, dev->curr_temp); - mt7601u_rxdc_cal(dev); } @@ -1160,9 +1158,6 @@ static int mt7601u_init_cal(struct mt7601u_dev *dev) if (ret) return ret; ret = mt7601u_mcu_calibrate(dev, MCU_CAL_RXIQ, 0); - if (ret) - return ret; - ret = mt7601u_mcu_calibrate(dev, MCU_CAL_DPD, dev->dpd_temp); if (ret) return ret; -- 2.43.4 . From: Jason-JH.Lin To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: , , , , "Jason-JH . Lin" , Singo Chang , Nancy Lin , , Jeffrey Kardatzke Subject: [PATCH] drm/mediatek: Fix missing configuration flags in mtk_crtc_ddp_config() Date: Wed, 3 Jul 2024 18:33:08 +0800 Message-ID: <20240703103308.10198-1-jason-jh.lin@mediatek.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266395 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In mtk_crtc_ddp_config(), mtk_crtc will use some configuration flags to generate instructions to cmdq_handle, such as: state->pending_config mtk_crtc->pending_planes plane_state->pending.config mtk_crtc->pending_async_planes plane_state->pending.async_config These configuration flags may be set to false when a GCE IRQ comes calling ddp_cmdq_cb(). This may result in missing prepare instructions, especially if mtk_crtc_update_config() with the flase need_vblank (no need to wait for vblank) cases. Therefore, use the mtk_crtc->config_updating flag set at the beginning of mtk_crtc_update_config() to ensure that these configuration flags won't be changed when the mtk_crtc_ddp_config() is preparing instructions. Fixes: 7f82d9c43879 ("drm/mediatek: Clear pending flag when cmdq packet is done") Signed-off-by: Jason-JH.Lin --- drivers/gpu/drm/mediatek/mtk_crtc.c | 34 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c index 6f34f573e127..bc3bf0c3edd9 100644 --- a/drivers/gpu/drm/mediatek/mtk_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c @@ -314,30 +314,32 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg) state = to_mtk_crtc_state(mtk_crtc->base.state); - state->pending_config = false; + if (!mtk_crtc->config_updating) { + state->pending_config = false; - if (mtk_crtc->pending_planes) { - for (i = 0; i < mtk_crtc->layer_nr; i++) { - struct drm_plane *plane = &mtk_crtc->planes[i]; - struct mtk_plane_state *plane_state; + if (mtk_crtc->pending_planes) { + for (i = 0; i < mtk_crtc->layer_nr; i++) { + struct drm_plane *plane = &mtk_crtc->planes[i]; + struct mtk_plane_state *plane_state; - plane_state = to_mtk_plane_state(plane->state); + plane_state = to_mtk_plane_state(plane->state); - plane_state->pending.config = false; + plane_state->pending.config = false; + } + mtk_crtc->pending_planes = false; } - mtk_crtc->pending_planes = false; - } - if (mtk_crtc->pending_async_planes) { - for (i = 0; i < mtk_crtc->layer_nr; i++) { - struct drm_plane *plane = &mtk_crtc->planes[i]; - struct mtk_plane_state *plane_state; + if (mtk_crtc->pending_async_planes) { + for (i = 0; i < mtk_crtc->layer_nr; i++) { + struct drm_plane *plane = &mtk_crtc->planes[i]; + struct mtk_plane_state *plane_state; - plane_state = to_mtk_plane_state(plane->state); + plane_state = to_mtk_plane_state(plane->state); - plane_state->pending.async_config = false; + plane_state->pending.async_config = false; + } + mtk_crtc->pending_async_planes = false; } - mtk_crtc->pending_async_planes = false; } mtk_crtc->cmdq_vblank_cnt = 0; -- 2.18.0 . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 4.19 000/139] 4.19.317-rc1 review Date: Wed, 3 Jul 2024 12:38:17 +0200 Message-ID: <20240703102830.432293640@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.317-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.317-rc1 X-KernelTest-Deadline: 2024-07-05T10:28+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266406 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 4.19.317 release. There are 139 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, 05 Jul 2024 10:28:04 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.317-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-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 4.19.317-rc1 Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 Kuniyuki Iwashima tcp: Fix data races around icsk->icsk_af_ops. Kuniyuki Iwashima ipv6: Fix data races around sk->sk_prot. Eric Dumazet ipv6: annotate some data-races around sk->sk_prot Uwe Kleine-König pwm: stm32: Refuse too small period requests Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Stefan Eichenberger serial: imx: set receiver level before starting uart Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Fernando Yang iio: adc: ad7266: Fix variable checking bug Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Linus Torvalds x86: stop playing stack games in profile_pc() Grygorii Tertychnyi i2c: ocores: set IACK bit after core is enabled Federico Vaga i2c: ocores: stop transfer on timeout Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Pablo Neira Ayuso netfilter: nf_tables: validate family when identifying table via handle Alex Deucher drm/amdgpu: fix UBSAN warning in kv_dpm.c Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER Stanislaw Gruszka usb: xhci: do not perform Soft Retry for some xHCI hosts Mathias Nyman xhci: Set correct transferred length for cancelled bulk transfers Mathias Nyman xhci: Use soft retry to recover faster from transaction errors Breno Leitao scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory Suganath Prabu scsi: mpt3sas: Gracefully handle online firmware update Joe Perches scsi: mpt3sas: Add ioc_ logging macros Marc Ferland iio: dac: ad5592r: fix temperature channel scaling value Alexandru Ardelean iio: dac: ad5592r: un-indent code-block for scale read Sergiu Cuciurean iio: dac: ad5592r-base: Replace indio_dev->mlock with own device lock Yazen Ghannam x86/amd_nb: Check for invalid SMN reads Naveen Naidu PCI: Add PCI_ERROR_RESPONSE and related definitions Haifeng Xu perf/core: Fix missing wakeup when waiting for context reference Jeff Johnson tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test Masami Hiramatsu selftests/ftrace: Fix checkbashisms errors Krzysztof Kozlowski ARM: dts: samsung: smdk4412: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: smdkv310: fix keypad no-autorepeat Peter Oberparleiter gcov: add support for GCC 14 Alex Deucher drm/radeon: fix UBSAN warning in kv_dpm.c Raju Rangoju ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Nikita Shubin dmaengine: ioatdma: Fix missing kmem_cache_destroy() Biju Das regulator: core: Fix modpost error "regulator_get_regmap" undefined Oliver Neukum net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Heng Qi virtio_net: checksum offloading handling fix Eric Dumazet xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Eric Dumazet ipv6: prevent possible NULL dereference in rt6_probe() Gavrilov Ilia netrom: Fix a memory leak in nr_heartbeat_expiry() Ondrej Mosnacek cipso: fix total option length computation Ilpo Järvinen MIPS: Routerboard 532: Fix vendor retry check code Songyang Li MIPS: Octeon: Add PCIe link status check Mario Limonciello PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Roman Smirnov udf: udftime: prevent overflow in udf_disk_stamp_to_time() Alex Henrie usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Michael Ellerman powerpc/io: Avoid clang null pointer arithmetic warnings Nathan Lynch powerpc/pseries: Enforce hcall result buffer validity and size Manish Rangankar scsi: qedi: Fix crash while reading debugfs attribute Eric Dumazet batman-adv: bypass empty buckets in batadv_purge_orig_ref() Paul E. McKenney rcutorture: Fix rcu_torture_one_read() pipe_count overflow comment Shichao Lai usb-storage: alauda: Check whether the media is initialized Matthias Goergens hugetlb_encode.h: fix undefined behaviour (34 << 26) Vineeth Pillai hv_utils: drain the timesync packets on onchannelcallback Ryusuke Konishi nilfs2: fix potential kernel bug due to lack of writeback flag waiting Alexander Shishkin intel_th: pci: Add Lunar Lake support Alexander Shishkin intel_th: pci: Add Meteor Lake-S support Alexander Shishkin intel_th: pci: Add Sapphire Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids support Nuno Sa dmaengine: axi-dmac: fix possible race in remove() Rick Wertenbroek PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id Su Yue ocfs2: fix races between hole punching and AIO+DIO Su Yue ocfs2: use coarse time for new created files Rik van Riel fs/proc: fix softlockup in __read_vmcore Hagar Gamal Halim Hemdan vmci: prevent speculation leaks by sanitizing event in event_deliver() Jani Nikula drm/exynos/vidi: fix memory leak in .get_modes() Dirk Behme drivers: core: synchronize really_probe() and dev_uevent() Petr Pavlu net/ipv6: Fix the RT cache flush via sysctl using a previous delay Aditya Pakki ipv6/route: Add a missing check on proc_dointvec Luiz Augusto von Dentz Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ Eric Dumazet tcp: fix race in tcp_v6_syn_recv_sock() Adam Miotk drm/bridge/panel: Fix runtime warning on panel bridge release Aleksandr Mishin liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet Kun(llfl) iommu/amd: Fix sysfs leak in iommu init Nikita Zhandarovich HID: core: remove unnecessary WARN_ON() in implement() Eric Dumazet xsk: validate user input for XDP_{UMEM|COMPLETION}_FILL_RING Dmitry Torokhov Input: try trimming too long modalias strings Kuangyi Chiang xhci: Apply broken streams quirk to Etron EJ188 xHCI host Kuangyi Chiang xhci: Apply reset resume quirk to Etron EJ188 xHCI host Greg Kroah-Hartman jfs: xattr: fix buffer overflow for invalid xattr Tomas Winkler mei: me: release irq in mei_me_pci_resume error path Alan Stern USB: class: cdc-wdm: Fix CPU lockup caused by excessive log messages Ryusuke Konishi nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors Matthew Wilcox (Oracle) nilfs2: return the mapped address from nilfs_get_page() Matthew Wilcox (Oracle) nilfs2: Remove check for PageError Dev Jain selftests/mm: compaction_test: fix bogus test success on Aarch64 Mark Brown selftests/mm: log a consistent test name for check_compaction Muhammad Usama Anjum selftests/mm: conform test to TAP format output Dev Jain selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages Hans Verkuil media: mc: mark the media devnode as registered from the, start Hugo Villeneuve serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler Hugo Villeneuve serial: sc16is7xx: replace hardcoded divisor value with BIT() macro George Shen drm/amd/display: Handle Y carry-over in VCP X.Y calculation Wesley Cheng usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_shutdown in sk_diag_fill(). Kuniyuki Iwashima af_unix: Use skb_queue_len_lockless() in sk_diag_show_rqlen(). Kuniyuki Iwashima af_unix: Use unix_recvq_full_lockless() in unix_stream_connect(). Kuniyuki Iwashima af_unix: Annotate data-race of net->unx.sysctl_max_dgram_qlen. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in UNIX_DIAG. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in sendmsg() and recvmsg(). Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in unix_write_space() and poll(). Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_inq_len(). Karol Kolacinski ptp: Fix error message on failed pin verification Jason Xing tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB Daniel Borkmann vxlan: Fix regression when dropping packets due to invalid src addresses Eric Dumazet ipv6: sr: block BH in seg6_output_core() and seg6_input_core() Emmanuel Grumbach wifi: iwlwifi: mvm: don't read past the mfuart notifcation Johannes Berg wifi: iwlwifi: mvm: revert gen2 TX A-MPDU size to 64 Remi Pommarel wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() Nicolas Escande wifi: mac80211: mesh: Fix leak of mesh_preq_queue objects ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/hexagon/include/asm/syscalls.h | 6 ++ arch/hexagon/kernel/syscalltab.c | 7 ++ arch/mips/pci/ops-rc32434.c | 4 +- arch/mips/pci/pcie-octeon.c | 6 ++ arch/powerpc/include/asm/hvcall.h | 8 +- arch/powerpc/include/asm/io.h | 24 ++--- arch/x86/kernel/amd_nb.c | 9 +- arch/x86/kernel/time.c | 21 +--- drivers/acpi/acpica/exregion.c | 23 +---- drivers/ata/libata-core.c | 8 +- drivers/base/core.c | 3 + drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/ioat/init.c | 1 + drivers/gpio/gpio-davinci.c | 5 + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 ++ drivers/gpu/drm/bridge/panel.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 ++ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 + drivers/hid/hid-core.c | 1 - drivers/hv/hv_util.c | 19 +++- drivers/hwtracing/intel_th/pci.c | 25 +++++ drivers/i2c/busses/i2c-ocores.c | 56 +++++++++-- drivers/iio/adc/ad7266.c | 2 + drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 ++++++++++-- drivers/iio/dac/ad5592r-base.c | 62 ++++++------ drivers/iio/dac/ad5592r-base.h | 1 + drivers/input/input.c | 105 ++++++++++++++++--- drivers/iommu/amd_iommu_init.c | 9 ++ drivers/media/dvb-core/dvbdev.c | 2 +- drivers/media/media-devnode.c | 5 +- drivers/misc/mei/pci-me.c | 4 +- drivers/misc/vmw_vmci/vmci_event.c | 6 +- drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 11 +- drivers/net/usb/ax88179_178a.c | 6 +- drivers/net/usb/rtl8150.c | 3 +- drivers/net/virtio_net.c | 11 +- drivers/net/vxlan.c | 4 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 -- drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 9 +- drivers/pci/controller/pcie-rockchip-ep.c | 6 +- drivers/pci/pci.c | 12 +++ drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 63 ++++++++++-- drivers/ptp/ptp_chardev.c | 3 +- drivers/pwm/pwm-stm32.c | 3 + drivers/regulator/core.c | 1 + drivers/scsi/mpt3sas/mpt3sas_base.c | 112 +++++++++++++++++++++ drivers/scsi/mpt3sas/mpt3sas_base.h | 11 ++ drivers/scsi/qedi/qedi_debugfs.c | 12 +-- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/mcf.c | 2 +- drivers/tty/serial/sc16is7xx.c | 25 +++-- drivers/usb/atm/cxacru.c | 14 +++ drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/gadget/function/f_fs.c | 4 + drivers/usb/gadget/function/f_printer.c | 1 + drivers/usb/host/xhci-pci.c | 12 +++ drivers/usb/host/xhci-ring.c | 25 ++++- drivers/usb/host/xhci.h | 3 + drivers/usb/misc/uss720.c | 22 ++-- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/storage/alauda.c | 9 +- fs/jfs/xattr.c | 4 +- fs/nilfs2/dir.c | 59 ++++++----- fs/nilfs2/segment.c | 3 + fs/ocfs2/file.c | 2 + fs/ocfs2/namei.c | 2 +- fs/open.c | 4 +- fs/proc/vmcore.c | 2 + fs/udf/udftime.c | 11 +- include/linux/compat.h | 2 +- include/linux/nvme.h | 4 +- include/linux/pci.h | 9 ++ include/linux/syscalls.h | 2 +- include/net/bluetooth/hci_core.h | 36 ++++++- include/net/netfilter/nf_tables.h | 5 + include/uapi/asm-generic/hugetlb_encode.h | 24 ++--- kernel/events/core.c | 13 +++ kernel/gcov/gcc_4_7.c | 4 +- kernel/rcu/rcutorture.c | 3 +- kernel/trace/preemptirq_delay_test.c | 1 + net/batman-adv/originator.c | 29 ++++++ net/bluetooth/l2cap_core.c | 8 +- net/core/sock.c | 6 +- net/ipv4/af_inet.c | 38 +++++-- net/ipv4/cipso_ipv4.c | 12 ++- net/ipv4/tcp.c | 16 ++- net/ipv6/af_inet6.c | 14 ++- net/ipv6/ipv6_sockglue.c | 9 +- net/ipv6/route.c | 8 +- net/ipv6/seg6_iptunnel.c | 14 ++- net/ipv6/tcp_ipv6.c | 9 +- net/ipv6/xfrm6_policy.c | 8 +- net/iucv/iucv.c | 26 +++-- net/mac80211/mesh_pathtbl.c | 13 +++ net/mac80211/sta_info.c | 4 +- net/netfilter/nf_tables_api.c | 13 +-- net/netfilter/nft_lookup.c | 3 +- net/netrom/nr_timer.c | 3 +- net/unix/af_unix.c | 47 ++++----- net/unix/diag.c | 12 +-- net/xdp/xsk.c | 4 + sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/synth/emux/soundfont.c | 17 ++-- tools/include/asm-generic/hugetlb_encode.h | 20 ++-- .../trigger/trigger-trace-marker-snapshot.tc | 4 +- tools/testing/selftests/vm/compaction_test.c | 108 +++++++++++--------- 118 files changed, 1141 insertions(+), 464 deletions(-) . From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= To: netdev@vger.kernel.org Cc: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , Davide Caratti , Ilya Maximets , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Ahern , Simon Horman , Ratheesh Kannoth , Florian Westphal , Alexander Lobakin , linux-kernel@vger.kernel.org Subject: [PATCH net-next 0/9] flower: rework TCA_FLOWER_KEY_ENC_FLAGS usage Date: Wed, 3 Jul 2024 10:45:49 +0000 Message-ID: <20240703104600.455125-1-ast@fiberby.net> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266411 org.kernel.vger.netdev:355525 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series reworks the recently added TCA_FLOWER_KEY_ENC_FLAGS attribute, to be more like TCA_FLOWER_KEY_FLAGS, and use the unused u32 flags field in FLOW_DISSECTOR_KEY_ENC_CONTROL, instead of adding a new flags field as FLOW_DISSECTOR_KEY_ENC_FLAGS. I have defined the new FLOW_DIS_F_* and TCA_FLOWER_KEY_FLAGS_* flags to co-exist with the existing flags, so the meaning of the flags field in struct flow_dissector_key_control is not depending on the context it is used in. If we run out of bits then we can always split them up later, if we really want to. Future flags might also be valid in both contexts. iproute2 RFC patch: https://lore.kernel.org/897379f1850a50d8c320ca3facd06c5f03943bac.1719506876.git.dcaratti@redhat.com/ --- Changelog: v1: - Change netlink attribute type from NLA_U32 to NLA_BE32. - Ensure that the FLOW_DISSECTOR_KEY_ENC_CONTROL is also masked for non-IP. - Fix preexisting typo in kdoc for struct flow_dissector_key_control (all suggested by Davide) RFC: https://lore.kernel.org/20240611235355.177667-1-ast@fiberby.net/ Asbjørn Sloth Tønnesen (9): net/sched: flower: define new tunnel flags net/sched: cls_flower: prepare fl_{set,dump}_key_flags() for ENC_FLAGS net/sched: cls_flower: add policy for TCA_FLOWER_KEY_FLAGS flow_dissector: prepare for encapsulated control flags flow_dissector: set encapsulated control flags from tun_flags net/sched: cls_flower: add tunnel flags to fl_{set,dump}_key_flags() net/sched: cls_flower: rework TCA_FLOWER_KEY_ENC_FLAGS usage flow_dissector: cleanup FLOW_DISSECTOR_KEY_ENC_FLAGS flow_dissector: set encapsulation control flags for non-IP include/net/flow_dissector.h | 26 +++---- include/net/ip_tunnels.h | 12 --- include/uapi/linux/pkt_cls.h | 9 ++- net/core/flow_dissector.c | 50 ++++++------ net/sched/cls_flower.c | 142 ++++++++++++++++++++--------------- 5 files changed, 129 insertions(+), 110 deletions(-) -- 2.45.2 . From: Aleksandr Mishin To: Michael Hennerich CC: Aleksandr Mishin , Lars-Peter Clausen , Jonathan Cameron , Greg Kroah-Hartman , Datta Shubhrajyoti , , , , Subject: [PATCH] staging: iio: frequency: ad9834: Validate frequency parameter value Date: Wed, 3 Jul 2024 13:47:34 +0300 Message-ID: <20240703104734.12034-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186302 [Jul 03 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;mx1.t-argos.ru.ru:7.1.1;t-argos.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/03 07:47:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/03 06:16:00 #25818842 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266424 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-staging,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In ad9834_write_frequency() clk_get_rate() can return 0. In such case ad9834_calc_freqreg() call will lead to division by zero. Checking 'if (fout > (clk_freq / 2))' doesn't protect in case of 'fout' is 0. ad9834_write_frequency() is called from ad9834_write(), where fout is taken from text buffer, which can contain any value. Modify parameters checking. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 12b9d5bf76bf ("Staging: IIO: DDS: AD9833 / AD9834 driver") Signed-off-by: Aleksandr Mishin --- drivers/staging/iio/frequency/ad9834.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c index a7a5cdcc6590..9e42129f44f7 100644 --- a/drivers/staging/iio/frequency/ad9834.c +++ b/drivers/staging/iio/frequency/ad9834.c @@ -114,7 +114,7 @@ static int ad9834_write_frequency(struct ad9834_state *st, clk_freq = clk_get_rate(st->mclk); - if (fout > (clk_freq / 2)) + if (!fout || fout > (clk_freq / 2)) return -EINVAL; regval = ad9834_calc_freqreg(clk_freq, fout); -- 2.30.2 . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 5.4 000/189] 5.4.279-rc1 review Date: Wed, 3 Jul 2024 12:37:41 +0200 Message-ID: <20240703102841.492044697@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.279-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.279-rc1 X-KernelTest-Deadline: 2024-07-05T10:28+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266425 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 5.4.279 release. There are 189 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, 05 Jul 2024 10:28:06 +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.279-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.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 5.4.279-rc1 Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Kuniyuki Iwashima tcp: Fix data races around icsk->icsk_af_ops. Kuniyuki Iwashima ipv6: Fix data races around sk->sk_prot. Eric Dumazet ipv6: annotate some data-races around sk->sk_prot Matthew Wilcox (Oracle) nfs: Leave pages in the pagecache if readpage failed Uwe Kleine-König pwm: stm32: Refuse too small period requests Jaime Liao mtd: spinand: macronix: Add support for serial NAND flash Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Arnd Bergmann sh: rework sync_file_range ABI Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Stefan Eichenberger serial: imx: set receiver level before starting uart Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Fernando Yang iio: adc: ad7266: Fix variable checking bug Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Linus Torvalds x86: stop playing stack games in profile_pc() Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Divya Koppera net: phy: mchp: Add support for LAN8814 QUAD PHY Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Pablo Neira Ayuso netfilter: nf_tables: validate family when identifying table via handle Alex Deucher drm/amdgpu: fix UBSAN warning in kv_dpm.c Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER Marc Ferland iio: dac: ad5592r: fix temperature channel scaling value Alexandru Ardelean iio: dac: ad5592r: un-indent code-block for scale read Sergiu Cuciurean iio: dac: ad5592r-base: Replace indio_dev->mlock with own device lock Yazen Ghannam x86/amd_nb: Check for invalid SMN reads Naveen Naidu PCI: Add PCI_ERROR_RESPONSE and related definitions Haifeng Xu perf/core: Fix missing wakeup when waiting for context reference Matthias Maennich kheaders: explicitly define file modes for archived headers Masahiro Yamada Revert "kheaders: substituting --sort in archive creation" Jeff Johnson tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test Harald Freudenberger s390/cpacf: Make use of invalid opcode produce a link error Johan Hovold arm64: dts: qcom: qcs404: fix bluetooth device address Krzysztof Kozlowski ARM: dts: samsung: smdk4412: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: smdkv310: fix keypad no-autorepeat Grygorii Tertychnyi i2c: ocores: set IACK bit after core is enabled Peter Oberparleiter gcov: add support for GCC 14 Alex Deucher drm/radeon: fix UBSAN warning in kv_dpm.c Raju Rangoju ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Nikita Shubin dmaengine: ioatdma: Fix missing kmem_cache_destroy() Biju Das regulator: core: Fix modpost error "regulator_get_regmap" undefined Oliver Neukum net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Jozsef Kadlecsik netfilter: ipset: Fix suspicious rcu_dereference_protected() Heng Qi virtio_net: checksum offloading handling fix David Ruth net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc() Pedro Tammela net/sched: act_api: rely on rcu in tcf_idr_check_alloc Yue Haibing netns: Make get_net_ns() handle zero refcount net Eric Dumazet xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Eric Dumazet ipv6: prevent possible NULL dereference in rt6_probe() Eric Dumazet ipv6: prevent possible NULL deref in fib6_nh_init() Gavrilov Ilia netrom: Fix a memory leak in nr_heartbeat_expiry() Ondrej Mosnacek cipso: fix total option length computation Christian Marangi mips: bmips: BCM6358: make sure CBR is correctly set Ilpo Järvinen MIPS: Routerboard 532: Fix vendor retry check code Songyang Li MIPS: Octeon: Add PCIe link status check Mario Limonciello PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Roman Smirnov udf: udftime: prevent overflow in udf_disk_stamp_to_time() Alex Henrie usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Michael Ellerman powerpc/io: Avoid clang null pointer arithmetic warnings Nathan Lynch powerpc/pseries: Enforce hcall result buffer validity and size Uri Arev Bluetooth: ath3k: Fix multiple issues reported by checkpatch.pl Manish Rangankar scsi: qedi: Fix crash while reading debugfs attribute Wander Lairson Costa drop_monitor: replace spin_lock by raw_spin_lock Eric Dumazet batman-adv: bypass empty buckets in batadv_purge_orig_ref() Alessandro Carminati (Red Hat) selftests/bpf: Prevent client connect before server bind in test_tc_tunnel.sh Paul E. McKenney rcutorture: Fix rcu_torture_one_read() pipe_count overflow comment Jean Delvare i2c: at91: Fix the functionality flags of the slave-only interface Shichao Lai usb-storage: alauda: Check whether the media is initialized Sicong Huang greybus: Fix use-after-free bug in gb_interface_release due to race condition. Florian Westphal netfilter: nftables: exthdr: fix 4-byte stack OOB write Matthias Goergens hugetlb_encode.h: fix undefined behaviour (34 << 26) Vineeth Pillai hv_utils: drain the timesync packets on onchannelcallback Oleg Nesterov tick/nohz_full: Don't abuse smp_call_function_single() in tick_setup_device() Ryusuke Konishi nilfs2: fix potential kernel bug due to lack of writeback flag waiting Alexander Shishkin intel_th: pci: Add Lunar Lake support Alexander Shishkin intel_th: pci: Add Meteor Lake-S support Alexander Shishkin intel_th: pci: Add Sapphire Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids support Nuno Sa dmaengine: axi-dmac: fix possible race in remove() Rick Wertenbroek PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id Su Yue ocfs2: fix races between hole punching and AIO+DIO Su Yue ocfs2: use coarse time for new created files Rik van Riel fs/proc: fix softlockup in __read_vmcore Hagar Gamal Halim Hemdan vmci: prevent speculation leaks by sanitizing event in event_deliver() Steven Rostedt (Google) tracing/selftests: Fix kprobe event name test for .isra. functions Marek Szyprowski drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found Jani Nikula drm/exynos/vidi: fix memory leak in .get_modes() Dirk Behme drivers: core: synchronize really_probe() and dev_uevent() Taehee Yoo ionic: fix use after netif_napi_del() Petr Pavlu net/ipv6: Fix the RT cache flush via sysctl using a previous delay Jozsef Kadlecsik netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type Luiz Augusto von Dentz Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ Gal Pressman net/mlx5e: Fix features validation check for tunneled UDP (non-VXLAN) packets Eric Dumazet tcp: fix race in tcp_v6_syn_recv_sock() Adam Miotk drm/bridge/panel: Fix runtime warning on panel bridge release Amjad Ouled-Ameur drm/komeda: check for error-valued pointer Aleksandr Mishin liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet José Expósito HID: logitech-dj: Fix memory leak in logi_dj_recv_switch_to_dj_mode() Lu Baolu iommu: Return right value in iommu_sva_bind_device() Kun(llfl) iommu/amd: Fix sysfs leak in iommu init Nikita Zhandarovich HID: core: remove unnecessary WARN_ON() in implement() Gregor Herburger gpio: tqmx86: fix typo in Kconfig label Chen Hanxiao SUNRPC: return proper error from gss_wrap_req_priv Dmitry Torokhov Input: try trimming too long modalias strings Breno Leitao scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory Kuangyi Chiang xhci: Apply broken streams quirk to Etron EJ188 xHCI host Kuangyi Chiang xhci: Apply reset resume quirk to Etron EJ188 xHCI host Mathias Nyman xhci: Set correct transferred length for cancelled bulk transfers Greg Kroah-Hartman jfs: xattr: fix buffer overflow for invalid xattr Tomas Winkler mei: me: release irq in mei_me_pci_resume error path Alan Stern USB: class: cdc-wdm: Fix CPU lockup caused by excessive log messages Ryusuke Konishi nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors Matthew Wilcox (Oracle) nilfs2: return the mapped address from nilfs_get_page() Matthew Wilcox (Oracle) nilfs2: Remove check for PageError Harald Freudenberger s390/cpacf: Split and rework cpacf query functions Heiko Carstens s390/cpacf: get rid of register asm Dev Jain selftests/mm: compaction_test: fix bogus test success on Aarch64 Mark Brown selftests/mm: log a consistent test name for check_compaction Muhammad Usama Anjum selftests/mm: conform test to TAP format output Dev Jain selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages Hugo Villeneuve serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler Hugo Villeneuve serial: sc16is7xx: replace hardcoded divisor value with BIT() macro George Shen drm/amd/display: Handle Y carry-over in VCP X.Y calculation Joao Paulo Goncalves ASoC: ti: davinci-mcasp: Fix race condition during probe Peter Ujfalusi ASoC: ti: davinci-mcasp: Handle missing required DT properties Peter Ujfalusi ASoC: ti: davinci-mcasp: Simplify the configuration parameter handling Peter Ujfalusi ASoC: ti: davinci-mcasp: Remove legacy dma_request parsing Peter Ujfalusi ASoC: ti: davinci-mcasp: Use platform_get_irq_byname_optional Zhang Qilong ASoC: ti: davinci-mcasp: remove always zero of davinci_mcasp_get_dt_params Colin Ian King ASoC: ti: davinci-mcasp: remove redundant assignment to variable ret Wesley Cheng usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete Eric Dumazet ipv6: fix possible race in __fib6_drop_pcpu_from() Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_shutdown in sk_diag_fill(). Kuniyuki Iwashima af_unix: Use skb_queue_len_lockless() in sk_diag_show_rqlen(). Kuniyuki Iwashima af_unix: Use unix_recvq_full_lockless() in unix_stream_connect(). Kuniyuki Iwashima af_unix: Annotate data-race of net->unx.sysctl_max_dgram_qlen. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in UNIX_DIAG. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in sendmsg() and recvmsg(). Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in unix_write_space() and poll(). Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_inq_len(). Karol Kolacinski ptp: Fix error message on failed pin verification Eric Dumazet net/sched: taprio: always validate TCA_TAPRIO_ATTR_PRIOMAP Moshe Shemesh net/mlx5: Stop waiting for PCI if pci channel is offline Jason Xing tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB Daniel Borkmann vxlan: Fix regression when dropping packets due to invalid src addresses Hangyu Hua net: sched: sch_multiq: fix possible OOB write in multiq_tune() Eric Dumazet ipv6: sr: block BH in seg6_output_core() and seg6_input_core() Emmanuel Grumbach wifi: iwlwifi: mvm: don't read past the mfuart notifcation Shahar S Matityahu wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Johannes Berg wifi: iwlwifi: mvm: revert gen2 TX A-MPDU size to 64 Lin Ma wifi: cfg80211: pmsr: use correct nla_get_uX functions Remi Pommarel wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() Nicolas Escande wifi: mac80211: mesh: Fix leak of mesh_preq_queue objects ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/rk3066a.dtsi | 1 + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/mips/bmips/setup.c | 3 +- arch/mips/pci/ops-rc32434.c | 4 +- arch/mips/pci/pcie-octeon.c | 6 + arch/parisc/kernel/syscalls/syscall.tbl | 4 +- arch/powerpc/include/asm/hvcall.h | 8 +- arch/powerpc/include/asm/io.h | 24 +- arch/s390/include/asm/cpacf.h | 307 ++++++++++++-------- arch/sh/kernel/sys_sh32.c | 11 + arch/sh/kernel/syscalls/syscall.tbl | 3 +- arch/sparc/kernel/syscalls/syscall.tbl | 2 +- arch/x86/kernel/amd_nb.c | 9 +- arch/x86/kernel/time.c | 20 +- drivers/acpi/acpica/exregion.c | 23 +- drivers/ata/libata-core.c | 8 +- drivers/base/core.c | 3 + drivers/bluetooth/ath3k.c | 25 +- drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/ioat/init.c | 1 + drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-davinci.c | 5 + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- drivers/gpu/drm/bridge/panel.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 + drivers/greybus/interface.c | 1 + drivers/hid/hid-core.c | 1 - drivers/hid/hid-logitech-dj.c | 4 +- drivers/hv/hv_util.c | 19 +- drivers/hwtracing/intel_th/pci.c | 25 ++ drivers/i2c/busses/i2c-at91-slave.c | 3 +- drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/iio/adc/ad7266.c | 2 + drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 +++- drivers/iio/dac/ad5592r-base.c | 62 ++-- drivers/iio/dac/ad5592r-base.h | 1 + drivers/input/input.c | 105 ++++++- drivers/iommu/amd_iommu_init.c | 9 + drivers/media/dvb-core/dvbdev.c | 2 +- drivers/misc/mei/pci-me.c | 4 +- drivers/misc/vmw_vmci/vmci_event.c | 6 +- drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci.c | 25 +- drivers/mtd/nand/spi/macronix.c | 99 +++++++ drivers/mtd/parsers/redboot.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 6 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 11 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/health.c | 8 + .../net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c | 4 + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/phy/micrel.c | 15 + drivers/net/usb/ax88179_178a.c | 6 +- drivers/net/usb/rtl8150.c | 3 +- drivers/net/virtio_net.c | 12 +- drivers/net/vxlan.c | 4 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 - drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 9 +- drivers/pci/controller/pcie-rockchip-ep.c | 6 +- drivers/pci/pci.c | 12 + drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 63 ++++- drivers/ptp/ptp_chardev.c | 3 +- drivers/pwm/pwm-stm32.c | 3 + drivers/regulator/core.c | 1 + drivers/scsi/mpt3sas/mpt3sas_base.c | 19 ++ drivers/scsi/qedi/qedi_debugfs.c | 12 +- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/mcf.c | 2 +- drivers/tty/serial/sc16is7xx.c | 25 +- drivers/usb/atm/cxacru.c | 14 + drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/gadget/function/f_fs.c | 4 + drivers/usb/gadget/function/f_printer.c | 1 + drivers/usb/host/xhci-pci.c | 7 + drivers/usb/host/xhci-ring.c | 5 +- drivers/usb/misc/uss720.c | 22 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/storage/alauda.c | 9 +- fs/jfs/xattr.c | 4 +- fs/nfs/read.c | 4 - fs/nilfs2/dir.c | 59 ++-- fs/nilfs2/segment.c | 3 + fs/ocfs2/file.c | 2 + fs/ocfs2/namei.c | 2 +- fs/open.c | 4 +- fs/proc/vmcore.c | 2 + fs/udf/udftime.c | 11 +- include/linux/compat.h | 2 +- include/linux/iommu.h | 2 +- include/linux/micrel_phy.h | 1 + include/linux/nvme.h | 4 +- include/linux/pci.h | 9 + include/linux/syscalls.h | 2 +- include/net/bluetooth/hci_core.h | 36 ++- include/net/netfilter/nf_tables.h | 5 + include/uapi/asm-generic/hugetlb_encode.h | 24 +- kernel/events/core.c | 13 + kernel/gcov/gcc_4_7.c | 4 +- kernel/gen_kheaders.sh | 9 +- kernel/rcu/rcutorture.c | 3 +- kernel/time/tick-common.c | 42 +-- kernel/trace/preemptirq_delay_test.c | 1 + net/batman-adv/originator.c | 29 ++ net/bluetooth/l2cap_core.c | 8 +- net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/drop_monitor.c | 20 +- net/core/net_namespace.c | 9 +- net/core/sock.c | 6 +- net/ipv4/af_inet.c | 23 +- net/ipv4/cipso_ipv4.c | 12 +- net/ipv4/tcp.c | 16 +- net/ipv6/af_inet6.c | 24 +- net/ipv6/ip6_fib.c | 6 +- net/ipv6/ipv6_sockglue.c | 9 +- net/ipv6/route.c | 9 +- net/ipv6/seg6_iptunnel.c | 14 +- net/ipv6/tcp_ipv6.c | 9 +- net/ipv6/xfrm6_policy.c | 8 +- net/iucv/iucv.c | 26 +- net/mac80211/mesh_pathtbl.c | 13 + net/mac80211/sta_info.c | 4 +- net/netfilter/ipset/ip_set_core.c | 104 ++++--- net/netfilter/ipset/ip_set_list_set.c | 30 +- net/netfilter/nf_tables_api.c | 13 +- net/netfilter/nft_exthdr.c | 17 +- net/netfilter/nft_lookup.c | 3 +- net/netrom/nr_timer.c | 3 +- net/sched/act_api.c | 66 +++-- net/sched/sch_multiq.c | 2 +- net/sched/sch_taprio.c | 15 +- net/sunrpc/auth_gss/auth_gss.c | 4 +- net/unix/af_unix.c | 47 ++-- net/unix/diag.c | 12 +- net/wireless/pmsr.c | 8 +- sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/ti/davinci-mcasp.c | 312 +++++++++------------ sound/synth/emux/soundfont.c | 17 +- tools/include/asm-generic/hugetlb_encode.h | 20 +- tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- .../ftrace/test.d/kprobe/kprobe_eventname.tc | 3 +- tools/testing/selftests/vm/compaction_test.c | 108 +++---- 163 files changed, 1693 insertions(+), 968 deletions(-) . From: Utsav Agarwal via B4 Relay Subject: [PATCH v5 0/3] adp5588-keys: Support for dedicated gpio operation Date: Wed, 03 Jul 2024 11:58:13 +0100 Message-Id: <20240703-adp5588_gpio_support-v5-0-49fcead0d390@analog.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Utsav Agarwal , Michael Hennerich , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , =?utf-8?q?Nuno_S=C3=A1?= Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Arturs Artamonovs , Vasileios Bimpikas , Oliver Gaskell X-Original-From: Utsav Agarwal Reply-To: utsav.agarwal@analog.com Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266435 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-input Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Current state of the driver for the ADP5588/87 only allows partial I/O to be used as GPIO. This support was previously present as a separate gpio driver, which was dropped with the commit 5ddc896088b0 ("gpio: gpio-adp5588: drop the driver") since the functionality was deemed to have been merged with adp5588-keys. This series of patches re-enables this support by allowing the driver to relax the requirement for registering a keymap and enable pure GPIO operation. Changelog ========== V2: - Changed gpio_only from a local variable to a member of struct adp5588_kpad - Removed condition from adp5588_probe() to skip adp5588_fw_parse() if gpio-only specified. adp558_fw_parse() now handles and returns 0 if gpio-only has been specified. - Added a check in adp5588_fw_parse() to make sure keypad properties(keypad,num-columns and keypad,num-rows) were not defined when gpio-only specified V3: - Moved device_property_present() for reading "gpio-only" into adp558_fw_parse() - Added print statements in case of error V4: - Added dt-bindings patch Signed-off-by: Utsav Agarwal --- V5: - Removed extra property "gpio-only", now pure gpio mode is detected via the adbsence of keypad specific properties. - Added dependencies for keypad properties to preserve the original requirements in case a pure gpio mode is not being used. - Added additional description for why the "interrupts" property was made optional - Rebased current work based on https://lore.kernel.org/linux-input/ZoLt_qBCQS-tG8Ar@google.com/ - Link to v4: https://lore.kernel.org/r/20240701-adp5588_gpio_support-v4-0-44bba0445e90@analog.com --- Dmitry Torokhov (1): iInput: adp5588-keys - use guard notation when acquiring mutexes Utsav Agarwal (2): Input: adp5588-keys - add support for pure gpio dt-bindings: input: Update dtbinding for adp5588 .../devicetree/bindings/input/adi,adp5588.yaml | 33 ++++++++-- drivers/input/keyboard/adp5588-keys.c | 70 ++++++++++++---------- 2 files changed, 66 insertions(+), 37 deletions(-) --- base-commit: 1c52cf5e79d30ac996f34b64284f2c317004d641 change-id: 20240701-adp5588_gpio_support-65db2bd21a9f Best regards, -- Utsav Agarwal . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 5.10 000/290] 5.10.221-rc1 review Date: Wed, 3 Jul 2024 12:36:21 +0200 Message-ID: <20240703102904.170852981@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.221-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.10.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.10.221-rc1 X-KernelTest-Deadline: 2024-07-05T10:29+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266439 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 5.10.221 release. There are 290 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, 05 Jul 2024 10:28:12 +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.10.221-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.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 5.10.221-rc1 Sebastian Andrzej Siewior xdp: xdp_mem_allocator can be NULL in trace_mem_connect(). Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Marc Zyngier KVM: arm64: vgic-v4: Make the doorbell request robust w.r.t preemption Ard Biesheuvel efi/x86: Free EFI memory map only when installing a new one. Ard Biesheuvel efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures Ard Biesheuvel efi: memmap: Move manipulation routines into x86 arch tree Liu Zixian efi: Correct comment on efi_memmap_alloc Zheng Zhi Yuan drivers: fix typo in firmware/efi/memmap.c Kuniyuki Iwashima tcp: Fix data races around icsk->icsk_af_ops. Kuniyuki Iwashima ipv6: Fix data races around sk->sk_prot. Eric Dumazet ipv6: annotate some data-races around sk->sk_prot Matthew Wilcox (Oracle) nfs: Leave pages in the pagecache if readpage failed Uwe Kleine-König pwm: stm32: Refuse too small period requests Jaime Liao mtd: spinand: macronix: Add support for serial NAND flash Arnd Bergmann syscalls: fix compat_sys_io_pgetevents_time64 usage Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Niklas Cassel ata: ahci: Clean up sysfs file on error Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Janusz Krzysztofik drm/i915/gt: Fix potential UAF by revoke of fence registers Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Arnd Bergmann sh: rework sync_file_range ABI Dragan Simic kbuild: Install dtb files as 0644 in Makefile.dtbinst Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Stefan Eichenberger serial: imx: set receiver level before starting uart Udit Kumar serial: 8250_omap: Implementation of Errata i2310 Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: fix races against disable Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Fernando Yang iio: adc: ad7266: Fix variable checking bug David Lechner counter: ti-eqep: enable clock at probe Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Jan Kara ocfs2: fix DIO failure due to insufficient transaction credits Linus Torvalds x86: stop playing stack games in profile_pc() Kent Gibson gpiolib: cdev: Disallow reconfiguration without direction (uAPI v1) Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Liu Ying drm/panel: simple: Add missing display timing flags for KOE TX26D202VM0BWA Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Erick Archer drm/radeon/radeon_display: Decrease the size of allocated memory Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Anton Protopopov bpf: Add a check for struct bpf_fib_lookup size Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Yunseong Kim tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset() Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() Daniil Dulov xdp: Remove WARN() from __xdp_reg_mem_model() Toke Høiland-Jørgensen xdp: Allow registering memory model without rxq reference Jakub Kicinski xdp: Move the rxq_info.mem clearing to unreg_mem_model() Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Jeff Layton nfsd: hold a lighter-weight client reference over CB_RECALL_ANY Chuck Lever SUNRPC: Fix svcxdr_init_encode's buflen calculation Chuck Lever SUNRPC: Fix svcxdr_init_decode's end-of-buffer calculation Chuck Lever SUNRPC: Fix a NULL pointer deref in trace_svc_stats_latency() Yunjian Wang SUNRPC: Fix null pointer dereference in svc_rqst_free() Pablo Neira Ayuso netfilter: nf_tables: validate family when identifying table via handle Alex Deucher drm/amdgpu: fix UBSAN warning in kv_dpm.c Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: use dedicated pinctrl type for RK3328 Jianqun Xu pinctrl/rockchip: separate struct rockchip_pin_bank to a head file Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER John Keeping Input: ili210x - fix ili251x_read_touch_data() return value Mario Limonciello ACPI: x86: Force StorageD3Enable on more products Mario Limonciello ACPI: x86: utils: Add Picasso to the list for forcing StorageD3Enable Mario Limonciello ACPI: x86: utils: Add Cezanne to the list for forcing StorageD3Enable Mario Limonciello ACPI: x86: Add another system to quirk list for forcing StorageD3Enable Mario Limonciello ACPI: x86: Add a quirk for Dell Inspiron 14 2-in-1 for StorageD3Enable Mario Limonciello ACPI: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint Jan Beulich x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node() Enzo Matsumiya smb: client: fix deadlock in smb2_find_smb_tcon() Shyam Prasad N cifs: missed ref-counting smb session in find Yazen Ghannam x86/amd_nb: Check for invalid SMN reads Naveen Naidu PCI: Add PCI_ERROR_RESPONSE and related definitions Haifeng Xu perf/core: Fix missing wakeup when waiting for context reference Matthias Maennich kheaders: explicitly define file modes for archived headers Masahiro Yamada Revert "kheaders: substituting --sort in archive creation" Ken Milmore r8169: Fix possible ring buffer corruption on fragmented Tx packets. Heiner Kallweit r8169: remove not needed check in rtl8169_start_xmit Heiner Kallweit r8169: remove nr_frags argument from rtl_tx_slots_avail Heiner Kallweit r8169: improve rtl8169_start_xmit Heiner Kallweit r8169: improve rtl_tx Heiner Kallweit r8169: remove unneeded memory barrier in rtl_tx Tony Luck x86/cpu: Fix x86_match_cpu() to match just X86_VENDOR_INTEL Tony Luck x86/cpu/vfm: Add new macros to work with (vendor/family/model) values Jeff Johnson tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test Harald Freudenberger s390/cpacf: Make use of invalid opcode produce a link error Matthew Mirvish bcache: fix variable length array abuse in btree_iter Vamshi Gajjela spmi: hisi-spmi-controller: Do not override device identifier Trond Myklebust knfsd: LOOKUP can return an illegal error value Tomi Valkeinen pmdomain: ti-sci: Fix duplicate PD referrals Bitterblue Smith wifi: rtlwifi: rtl8192de: Fix 5 GHz TX power Kees Cook rtlwifi: rtl8192de: Style clean-ups Krzysztof Kozlowski ARM: dts: samsung: smdk4412: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: smdkv310: fix keypad no-autorepeat Martin Leung drm/amd/display: revert Exit idle optimizations before HDCP execution Krzysztof Kozlowski dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema Grygorii Tertychnyi i2c: ocores: set IACK bit after core is enabled Aleksandr Nogikh kcov: don't lose track of remote references during softirqs Peter Oberparleiter gcov: add support for GCC 14 Alex Deucher drm/radeon: fix UBSAN warning in kv_dpm.c Edson Juliano Drosdeck ALSA: hda/realtek: Limit mic boost on N14AP7 Patrisious Haddad RDMA/mlx5: Add check for srq max_sge attribute Raju Rangoju ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Nikita Shubin dmaengine: ioatdma: Fix missing kmem_cache_destroy() Nikita Shubin dmaengine: ioatdma: Fix kmemleak in ioat_pci_probe() Nikita Shubin dmaengine: ioatdma: Fix error path in ioat3_dma_probe() Bjorn Helgaas dmaengine: ioat: use PCI core macros for PCIe Capability Nikita Shubin dmaengine: ioatdma: Fix leaking on version mismatch Bjorn Helgaas dmaengine: ioat: Drop redundant pci_enable_pcie_error_reporting() Qing Wang dmaengine: ioat: switch from 'pci_' to 'dma_' API Biju Das regulator: core: Fix modpost error "regulator_get_regmap" undefined Oliver Neukum net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Jozsef Kadlecsik netfilter: ipset: Fix suspicious rcu_dereference_protected() Heng Qi virtio_net: checksum offloading handling fix Xiaolei Wang net: stmmac: No need to calculate speed divider when offload is disabled Xin Long sched: act_ct: add netns into the key of tcf_ct_flow_table Vlad Buslov net/sched: act_ct: set 'net' pointer when creating new nf_flow_table Xin Long tipc: force a dst refcount before doing decryption David Ruth net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc() Pedro Tammela net/sched: act_api: rely on rcu in tcf_idr_check_alloc Stefan Wahren qca_spi: Make interrupt remembering atomic Yue Haibing netns: Make get_net_ns() handle zero refcount net Eric Dumazet xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Eric Dumazet ipv6: prevent possible NULL dereference in rt6_probe() Eric Dumazet ipv6: prevent possible NULL deref in fib6_nh_init() Gavrilov Ilia netrom: Fix a memory leak in nr_heartbeat_expiry() Ondrej Mosnacek cipso: fix total option length computation Masami Hiramatsu (Google) tracing: Build event generation tests only as modules Christian Marangi mips: bmips: BCM6358: make sure CBR is correctly set Ilpo Järvinen MIPS: Routerboard 532: Fix vendor retry check code Parker Newman serial: exar: adding missing CTI and Exar PCI ids Songyang Li MIPS: Octeon: Add PCIe link status check Mario Limonciello PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Roman Smirnov udf: udftime: prevent overflow in udf_disk_stamp_to_time() Alex Henrie usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Yunlei He f2fs: remove clear SB_INLINECRYPT flag in default_options Aleksandr Aprelkov iommu/arm-smmu-v3: Free MSIs in case of ENOMEM Tzung-Bi Shih power: supply: cros_usbpd: provide ID table for avoiding fallback match Michael Ellerman powerpc/io: Avoid clang null pointer arithmetic warnings Nathan Lynch powerpc/pseries: Enforce hcall result buffer validity and size Erico Nunes drm/lima: mask irqs in timeout path before hard reset Erico Nunes drm/lima: add mask irq callback to gp and pp Pierre-Louis Bossart ASoC: Intel: sof_sdw: add JD2 quirk for HP Omen 14 Nicholas Kazlauskas drm/amd/display: Exit idle optimizations before HDCP execution Uri Arev Bluetooth: ath3k: Fix multiple issues reported by checkpatch.pl Takashi Iwai ACPI: video: Add backlight=native quirk for Lenovo Slim 7 16ARH7 Sean O'Brien HID: Add quirk for Logitech Casa touchpad Breno Leitao netpoll: Fix race condition in netpoll_owner_active Kunwu Chan kselftest: arm64: Add a null pointer check Manish Rangankar scsi: qedi: Fix crash while reading debugfs attribute Wander Lairson Costa drop_monitor: replace spin_lock by raw_spin_lock Eric Dumazet af_packet: avoid a false positive warning in packet_setsockopt() Arnd Bergmann wifi: ath9k: work around memset overflow warning Eric Dumazet batman-adv: bypass empty buckets in batadv_purge_orig_ref() Yonghong Song selftests/bpf: Fix flaky test btf_map_in_map/lookup_update Alessandro Carminati (Red Hat) selftests/bpf: Prevent client connect before server bind in test_tc_tunnel.sh Justin Stitt block/ioctl: prefer different overflow check Zqiang rcutorture: Fix invalid context warning when enable srcu barrier testing Paul E. McKenney rcutorture: Fix rcu_torture_one_read() pipe_count overflow comment Herbert Xu padata: Disable BH when taking works lock on MT path Oleg Nesterov zap_pid_ns_processes: clear TIF_NOTIFY_SIGNAL along with TIF_SIGPENDING Jean Delvare i2c: designware: Fix the functionality flags of the slave-only interface Jean Delvare i2c: at91: Fix the functionality flags of the slave-only interface Shichao Lai usb-storage: alauda: Check whether the media is initialized Sicong Huang greybus: Fix use-after-free bug in gb_interface_release due to race condition. Beleswar Padhi remoteproc: k3-r5: Jump to error handling labels in start/stop errors YonglongLi mptcp: pm: update add_addr counters after connect YonglongLi mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID Paolo Abeni mptcp: ensure snd_una is properly initialized on connect Matthias Goergens hugetlb_encode.h: fix undefined behaviour (34 << 26) Doug Brown serial: 8250_pxa: Configure tx_loadsz to match FIFO IRQ level Oleg Nesterov tick/nohz_full: Don't abuse smp_call_function_single() in tick_setup_device() Ryusuke Konishi nilfs2: fix potential kernel bug due to lack of writeback flag waiting Alexander Shishkin intel_th: pci: Add Lunar Lake support Alexander Shishkin intel_th: pci: Add Meteor Lake-S support Alexander Shishkin intel_th: pci: Add Sapphire Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids support Beleswar Padhi remoteproc: k3-r5: Do not allow core1 to power up before core0 via sysfs Nuno Sa dmaengine: axi-dmac: fix possible race in remove() Rick Wertenbroek PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id Su Yue ocfs2: fix races between hole punching and AIO+DIO Su Yue ocfs2: use coarse time for new created files Rik van Riel fs/proc: fix softlockup in __read_vmcore Hagar Gamal Halim Hemdan vmci: prevent speculation leaks by sanitizing event in event_deliver() Marek Szyprowski drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found Jani Nikula drm/exynos/vidi: fix memory leak in .get_modes() Dirk Behme drivers: core: synchronize really_probe() and dev_uevent() Jean-Baptiste Maneyrol iio: imu: inv_icm42600: delete unneeded update watermark call Marc Ferland iio: dac: ad5592r: fix temperature channel scaling value David Lechner iio: adc: ad9467: fix scan type sign Taehee Yoo ionic: fix use after netif_napi_del() Petr Pavlu net/ipv6: Fix the RT cache flush via sysctl using a previous delay Xiaolei Wang net: stmmac: replace priv->speed with the portTransmitRate from the tc-cbs parameters Jozsef Kadlecsik netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type Luiz Augusto von Dentz Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ Gal Pressman net/mlx5e: Fix features validation check for tunneled UDP (non-VXLAN) packets Eric Dumazet tcp: fix race in tcp_v6_syn_recv_sock() Adam Miotk drm/bridge/panel: Fix runtime warning on panel bridge release Amjad Ouled-Ameur drm/komeda: check for error-valued pointer Aleksandr Mishin liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet Jie Wang net: hns3: add cond_resched() to hns3 ring buffer init process Csókás, Bence net: sfp: Always call `sfp_sm_mod_remove()` on remove Ian Forbes drm/vmwgfx: 3D disabled should not effect STDU memory limits José Expósito HID: logitech-dj: Fix memory leak in logi_dj_recv_switch_to_dj_mode() Lu Baolu iommu: Return right value in iommu_sva_bind_device() Kun(llfl) iommu/amd: Fix sysfs leak in iommu init Vasant Hegde iommu/amd: Introduce pci segment structure Matthias Schiffer gpio: tqmx86: store IRQ trigger type and unmask status separately Nikita Zhandarovich HID: core: remove unnecessary WARN_ON() in implement() Gregor Herburger gpio: tqmx86: fix typo in Kconfig label Chen Hanxiao SUNRPC: return proper error from gss_wrap_req_priv Dmitry Torokhov Input: try trimming too long modalias strings Michael Ellerman powerpc/uaccess: Fix build errors seen with GCC 13/14 Breno Leitao scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory Kuangyi Chiang xhci: Apply broken streams quirk to Etron EJ188 xHCI host Kuangyi Chiang xhci: Apply reset resume quirk to Etron EJ188 xHCI host Mathias Nyman xhci: Set correct transferred length for cancelled bulk transfers Greg Kroah-Hartman jfs: xattr: fix buffer overflow for invalid xattr Tomas Winkler mei: me: release irq in mei_me_pci_resume error path Alan Stern USB: class: cdc-wdm: Fix CPU lockup caused by excessive log messages Ryusuke Konishi nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors Matthew Wilcox (Oracle) nilfs2: return the mapped address from nilfs_get_page() Matthew Wilcox (Oracle) nilfs2: Remove check for PageError Filipe Manana btrfs: fix leak of qgroup extent records after transaction abort Harald Freudenberger s390/cpacf: Split and rework cpacf query functions Heiko Carstens s390/cpacf: get rid of register asm Dev Jain selftests/mm: compaction_test: fix bogus test success on Aarch64 Mark Brown selftests/mm: log a consistent test name for check_compaction Muhammad Usama Anjum selftests/mm: conform test to TAP format output Dev Jain selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages Uwe Kleine-König mmc: davinci: Don't strip remove function when driver is builtin Hugo Villeneuve serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler Hugo Villeneuve serial: sc16is7xx: replace hardcoded divisor value with BIT() macro George Shen drm/amd/display: Handle Y carry-over in VCP X.Y calculation Wesley Cheng usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete Eric Dumazet ipv6: fix possible race in __fib6_drop_pcpu_from() Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_shutdown in sk_diag_fill(). Kuniyuki Iwashima af_unix: Use skb_queue_len_lockless() in sk_diag_show_rqlen(). Kuniyuki Iwashima af_unix: Use unix_recvq_full_lockless() in unix_stream_connect(). Kuniyuki Iwashima af_unix: Annotate data-race of net->unx.sysctl_max_dgram_qlen. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in UNIX_DIAG. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in sendmsg() and recvmsg(). Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in unix_write_space() and poll(). Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_inq_len(). Karol Kolacinski ptp: Fix error message on failed pin verification Eric Dumazet net/sched: taprio: always validate TCA_TAPRIO_ATTR_PRIOMAP Jason Xing tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB Daniel Borkmann vxlan: Fix regression when dropping packets due to invalid src addresses Hangyu Hua net: sched: sch_multiq: fix possible OOB write in multiq_tune() Eric Dumazet ipv6: sr: block BH in seg6_output_core() and seg6_input_core() DelphineCCChiu net/ncsi: Fix the multi thread manner of NCSI driver Peter Delevoryas net/ncsi: Simplify Kconfig/dts control flow Ivan Mikhaylov net/ncsi: add NCSI Intel OEM command to keep PHY up Lingbo Kong wifi: mac80211: correctly parse Spatial Reuse Parameter Set element Emmanuel Grumbach wifi: iwlwifi: mvm: don't read past the mfuart notifcation Miri Korenblit wifi: iwlwifi: mvm: check n_ssids before accessing the ssids Shahar S Matityahu wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Johannes Berg wifi: iwlwifi: mvm: revert gen2 TX A-MPDU size to 64 Lin Ma wifi: cfg80211: pmsr: use correct nla_get_uX functions Remi Pommarel wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() Nicolas Escande wifi: mac80211: mesh: Fix leak of mesh_preq_queue objects Damien Le Moal null_blk: Print correct max open zones limit in null_init_zoned_dev() Steven Rostedt (Google) tracing/selftests: Fix kprobe event name test for .isra. functions ------------- Diffstat: .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- Makefile | 4 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/rk3066a.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kvm/arm.c | 6 +- arch/arm64/kvm/vgic/vgic-v3.c | 2 +- arch/arm64/kvm/vgic/vgic-v4.c | 8 +- arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/mips/bmips/setup.c | 3 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/mips/pci/ops-rc32434.c | 4 +- arch/mips/pci/pcie-octeon.c | 6 + arch/parisc/kernel/syscalls/syscall.tbl | 4 +- arch/powerpc/include/asm/hvcall.h | 8 +- arch/powerpc/include/asm/io.h | 24 +- arch/powerpc/include/asm/uaccess.h | 15 +- arch/powerpc/kernel/syscalls/syscall.tbl | 2 +- arch/s390/include/asm/cpacf.h | 307 +++++++++++++-------- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/sh/kernel/sys_sh32.c | 11 + arch/sh/kernel/syscalls/syscall.tbl | 3 +- arch/sparc/kernel/sys32.S | 221 --------------- arch/sparc/kernel/syscalls/syscall.tbl | 8 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/include/asm/cpu_device_id.h | 98 +++++++ arch/x86/include/asm/efi.h | 11 + arch/x86/kernel/amd_nb.c | 9 +- arch/x86/kernel/cpu/match.c | 4 +- arch/x86/kernel/time.c | 20 +- arch/x86/mm/numa.c | 6 +- arch/x86/platform/efi/Makefile | 3 +- arch/x86/platform/efi/efi.c | 8 +- arch/x86/platform/efi/memmap.c | 249 +++++++++++++++++ block/ioctl.c | 2 +- drivers/acpi/acpica/exregion.c | 23 +- drivers/acpi/device_pm.c | 3 + drivers/acpi/internal.h | 9 + drivers/acpi/video_detect.c | 8 + drivers/acpi/x86/utils.c | 34 +++ drivers/ata/ahci.c | 17 +- drivers/ata/libata-core.c | 8 +- drivers/base/core.c | 3 + drivers/block/null_blk/zoned.c | 2 +- drivers/bluetooth/ath3k.c | 25 +- drivers/counter/ti-eqep.c | 6 + drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/ioat/init.c | 73 +++-- drivers/dma/ioat/registers.h | 7 - drivers/firmware/efi/fdtparams.c | 4 + drivers/firmware/efi/memmap.c | 239 +--------------- drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-davinci.c | 5 + drivers/gpio/gpio-tqmx86.c | 46 +-- drivers/gpio/gpiolib-cdev.c | 16 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 + drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 2 + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- drivers/gpu/drm/bridge/panel.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + drivers/gpu/drm/lima/lima_bcast.c | 12 + drivers/gpu/drm/lima/lima_bcast.h | 3 + drivers/gpu/drm/lima/lima_gp.c | 8 + drivers/gpu/drm/lima/lima_pp.c | 18 ++ drivers/gpu/drm/lima/lima_sched.c | 7 + drivers/gpu/drm/lima/lima_sched.h | 1 + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/radeon/radeon.h | 1 - drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 - drivers/greybus/interface.c | 1 + drivers/hid/hid-core.c | 1 - drivers/hid/hid-ids.h | 1 + drivers/hid/hid-logitech-dj.c | 4 +- drivers/hid/hid-multitouch.c | 6 + drivers/hwtracing/intel_th/pci.c | 25 ++ drivers/i2c/busses/i2c-at91-slave.c | 3 +- drivers/i2c/busses/i2c-designware-slave.c | 2 +- drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/iio/adc/ad7266.c | 2 + drivers/iio/adc/ad9467.c | 4 +- drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 ++++- drivers/iio/dac/ad5592r-base.c | 2 +- drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 4 - drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 4 - drivers/infiniband/hw/mlx5/srq.c | 13 +- drivers/input/input.c | 105 ++++++- drivers/input/touchscreen/ili210x.c | 4 +- drivers/iommu/amd/amd_iommu_types.h | 24 +- drivers/iommu/amd/init.c | 55 +++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/md/bcache/bset.c | 44 +-- drivers/md/bcache/bset.h | 28 +- drivers/md/bcache/btree.c | 40 +-- drivers/md/bcache/super.c | 5 +- drivers/md/bcache/sysfs.c | 2 +- drivers/md/bcache/writeback.c | 10 +- drivers/media/dvb-core/dvbdev.c | 2 +- drivers/misc/mei/pci-me.c | 4 +- drivers/misc/vmw_vmci/vmci_event.c | 6 +- drivers/mmc/host/davinci_mmc.c | 4 +- drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci.c | 25 +- drivers/mtd/nand/spi/macronix.c | 112 ++++++++ drivers/mtd/parsers/redboot.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 6 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 11 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/ethernet/qualcomm/qca_debug.c | 6 +- drivers/net/ethernet/qualcomm/qca_spi.c | 16 +- drivers/net/ethernet/qualcomm/qca_spi.h | 3 +- drivers/net/ethernet/realtek/r8169_main.c | 48 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 55 ++-- drivers/net/phy/micrel.c | 1 + drivers/net/phy/sfp.c | 3 +- drivers/net/usb/ax88179_178a.c | 6 +- drivers/net/usb/rtl8150.c | 3 +- drivers/net/virtio_net.c | 12 +- drivers/net/vxlan/vxlan_core.c | 4 + drivers/net/wireless/ath/ath.h | 6 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 - drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 9 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 19 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - drivers/pci/controller/pcie-rockchip-ep.c | 6 +- drivers/pci/pci.c | 12 + drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 294 ++++---------------- drivers/pinctrl/pinctrl-rockchip.h | 246 +++++++++++++++++ drivers/power/supply/cros_usbpd-charger.c | 11 +- drivers/ptp/ptp_chardev.c | 3 +- drivers/pwm/pwm-stm32.c | 3 + drivers/regulator/core.c | 1 + drivers/remoteproc/ti_k3_r5_remoteproc.c | 25 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 19 ++ drivers/scsi/qedi/qedi_debugfs.c | 12 +- drivers/soc/ti/ti_sci_pm_domains.c | 20 +- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/staging/hikey9xx/hisi-spmi-controller.c | 1 - drivers/tty/serial/8250/8250_exar.c | 42 +++ drivers/tty/serial/8250/8250_omap.c | 25 +- drivers/tty/serial/8250/8250_pxa.c | 1 + drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/mcf.c | 2 +- drivers/tty/serial/sc16is7xx.c | 25 +- drivers/usb/atm/cxacru.c | 14 + drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/gadget/function/f_fs.c | 4 + drivers/usb/gadget/function/f_printer.c | 40 ++- drivers/usb/host/xhci-pci.c | 7 + drivers/usb/host/xhci-ring.c | 5 +- drivers/usb/misc/uss720.c | 22 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/storage/alauda.c | 9 +- fs/btrfs/disk-io.c | 10 +- fs/cifs/smb2transport.c | 12 +- fs/f2fs/super.c | 2 - fs/jfs/xattr.c | 4 +- fs/nfs/read.c | 4 - fs/nfsd/nfs4state.c | 7 +- fs/nfsd/nfsfh.c | 4 +- fs/nilfs2/dir.c | 59 ++-- fs/nilfs2/segment.c | 3 + fs/ocfs2/aops.c | 5 + fs/ocfs2/file.c | 2 + fs/ocfs2/journal.c | 17 ++ fs/ocfs2/journal.h | 2 + fs/ocfs2/namei.c | 2 +- fs/ocfs2/ocfs2_trace.h | 2 + fs/open.c | 4 +- fs/proc/vmcore.c | 2 + fs/udf/udftime.c | 11 +- include/kvm/arm_vgic.h | 2 +- include/linux/compat.h | 2 +- include/linux/efi.h | 10 +- include/linux/iommu.h | 2 +- include/linux/kcov.h | 2 + include/linux/mod_devicetable.h | 2 + include/linux/nvme.h | 4 +- include/linux/pci.h | 9 + include/linux/sunrpc/svc.h | 20 +- include/linux/syscalls.h | 2 +- include/net/bluetooth/hci_core.h | 36 ++- include/net/netfilter/nf_tables.h | 5 + include/net/xdp.h | 3 + include/trace/events/qdisc.h | 2 +- include/trace/events/sunrpc.h | 8 +- include/uapi/asm-generic/hugetlb_encode.h | 26 +- include/uapi/asm-generic/unistd.h | 2 +- kernel/events/core.c | 13 + kernel/gcov/gcc_4_7.c | 4 +- kernel/gen_kheaders.sh | 9 +- kernel/kcov.c | 1 + kernel/padata.c | 8 +- kernel/pid_namespace.c | 1 + kernel/rcu/rcutorture.c | 12 +- kernel/sys_ni.c | 2 +- kernel/time/tick-common.c | 42 +-- kernel/trace/Kconfig | 4 +- kernel/trace/preemptirq_delay_test.c | 1 + net/batman-adv/originator.c | 29 ++ net/bluetooth/l2cap_core.c | 8 +- net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/drop_monitor.c | 20 +- net/core/filter.c | 3 + net/core/net_namespace.c | 9 +- net/core/netpoll.c | 2 +- net/core/sock.c | 6 +- net/core/xdp.c | 100 ++++--- net/ipv4/af_inet.c | 23 +- net/ipv4/cipso_ipv4.c | 12 +- net/ipv4/tcp.c | 16 +- net/ipv6/af_inet6.c | 24 +- net/ipv6/ip6_fib.c | 6 +- net/ipv6/ipv6_sockglue.c | 9 +- net/ipv6/route.c | 9 +- net/ipv6/seg6_iptunnel.c | 14 +- net/ipv6/tcp_ipv6.c | 9 +- net/ipv6/xfrm6_policy.c | 8 +- net/iucv/iucv.c | 26 +- net/mac80211/he.c | 10 +- net/mac80211/mesh_pathtbl.c | 13 + net/mac80211/sta_info.c | 4 +- net/mptcp/pm_netlink.c | 18 +- net/mptcp/protocol.c | 1 + net/ncsi/Kconfig | 6 + net/ncsi/internal.h | 7 + net/ncsi/ncsi-manage.c | 112 +++++--- net/ncsi/ncsi-rsp.c | 4 +- net/netfilter/ipset/ip_set_core.c | 104 ++++--- net/netfilter/ipset/ip_set_list_set.c | 30 +- net/netfilter/nf_tables_api.c | 13 +- net/netfilter/nft_lookup.c | 3 +- net/netrom/nr_timer.c | 3 +- net/packet/af_packet.c | 26 +- net/sched/act_api.c | 66 +++-- net/sched/act_ct.c | 21 +- net/sched/sch_multiq.c | 2 +- net/sched/sch_taprio.c | 15 +- net/sunrpc/auth_gss/auth_gss.c | 4 +- net/sunrpc/svc.c | 18 +- net/tipc/node.c | 1 + net/unix/af_unix.c | 47 ++-- net/unix/diag.c | 12 +- net/wireless/pmsr.c | 8 +- scripts/Makefile.dtbinst | 2 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/intel/boards/sof_sdw.c | 9 + sound/synth/emux/soundfont.c | 17 +- tools/include/asm-generic/hugetlb_encode.h | 20 +- tools/testing/selftests/arm64/tags/tags_test.c | 4 + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +- tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- .../ftrace/test.d/kprobe/kprobe_eventname.tc | 3 +- tools/testing/selftests/vm/compaction_test.c | 108 ++++---- 278 files changed, 3057 insertions(+), 1923 deletions(-) . From: WANG Rui To: Huacai Chen Cc: WANG Xuerui , Xi Ruoyao , Xuefeng Li , loongarch@lists.linux.dev, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, WANG Rui Subject: [PATCH] LoongArch: rust: Use rustc option -Zdirect-access-external-data Date: Wed, 3 Jul 2024 19:06:24 +0800 Message-ID: <20240703110624.1301830-1-wangrui@loongson.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266444 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.loongarch,org.kernel.vger.rust-for-linux Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail -Zdirect-access-external-data is a new Rust compiler option added in Rust 1.78, which we use to optimize the access of external data in the Linux kernel's Rust code. This patch modifies the Rust code in vmlinux to directly access externa data, using PC-REL instead of GOT. However, Rust code whithin modules is constrained by the PC-REL addressing range and is explicitly set to use an indirect method. Signed-off-by: WANG Rui --- arch/loongarch/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/Makefile b/arch/loongarch/Makefile index 8674e7e24c4a..ae3f80622f4c 100644 --- a/arch/loongarch/Makefile +++ b/arch/loongarch/Makefile @@ -105,7 +105,8 @@ KBUILD_CFLAGS += -fno-jump-tables endif KBUILD_RUSTFLAGS += --target=loongarch64-unknown-none-softfloat -KBUILD_RUSTFLAGS_MODULE += -Crelocation-model=pic +KBUILD_RUSTFLAGS_KERNEL += -Zdirect-access-external-data=yes +KBUILD_RUSTFLAGS_MODULE += -Zdirect-access-external-data=no ifeq ($(CONFIG_RELOCATABLE),y) KBUILD_CFLAGS_KERNEL += -fPIE -- 2.45.2 . From: Sibi Sankar To: , , CC: , , , , , , , , Subject: [PATCH] pmdomain: arm: Fix debugfs node creation failure Date: Wed, 3 Jul 2024 16:37:41 +0530 Message-ID: <20240703110741.2668800-1-quic_sibis@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266446 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.arm-scmi,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The domain attributes returned by the perf protocol can end up reporting identical names across domains, resulting in debugfs node creation failure. Fix this duplication by appending the domain-id to the domain name. Logs: debugfs: Directory 'NCC' with parent 'pm_genpd' already present! debugfs: Directory 'NCC' with parent 'pm_genpd' already present! Fixes: 2af23ceb8624 ("pmdomain: arm: Add the SCMI performance domain") Signed-off-by: Sibi Sankar --- drivers/pmdomain/arm/scmi_perf_domain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pmdomain/arm/scmi_perf_domain.c b/drivers/pmdomain/arm/scmi_perf_domain.c index d7ef46ccd9b8..0af5dc941349 100644 --- a/drivers/pmdomain/arm/scmi_perf_domain.c +++ b/drivers/pmdomain/arm/scmi_perf_domain.c @@ -18,6 +18,7 @@ struct scmi_perf_domain { const struct scmi_perf_proto_ops *perf_ops; const struct scmi_protocol_handle *ph; const struct scmi_perf_domain_info *info; + char domain_name[SCMI_MAX_STR_SIZE]; u32 domain_id; }; @@ -123,7 +124,12 @@ static int scmi_perf_domain_probe(struct scmi_device *sdev) scmi_pd->domain_id = i; scmi_pd->perf_ops = perf_ops; scmi_pd->ph = ph; - scmi_pd->genpd.name = scmi_pd->info->name; + + /* Domain attributes can report identical names across domains */ + snprintf(scmi_pd->domain_name, sizeof(scmi_pd->domain_name), "%s-%d", + scmi_pd->info->name, scmi_pd->domain_id); + + scmi_pd->genpd.name = scmi_pd->domain_name; scmi_pd->genpd.flags = GENPD_FLAG_ALWAYS_ON | GENPD_FLAG_OPP_TABLE_FW; scmi_pd->genpd.set_performance_state = scmi_pd_set_perf_state; -- 2.34.1 . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 5.15 000/356] 5.15.162-rc1 review Date: Wed, 3 Jul 2024 12:35:36 +0200 Message-ID: <20240703102913.093882413@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.162-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.15.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.15.162-rc1 X-KernelTest-Deadline: 2024-07-05T10:29+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266450 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 5.15.162 release. There are 356 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, 05 Jul 2024 10:28:09 +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.15.162-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.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 5.15.162-rc1 Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 FUKAUMI Naoki arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Marc Zyngier KVM: arm64: vgic-v4: Make the doorbell request robust w.r.t preemption Ard Biesheuvel efi/x86: Free EFI memory map only when installing a new one. Ard Biesheuvel efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures Ard Biesheuvel efi: memmap: Move manipulation routines into x86 arch tree Liu Zixian efi: Correct comment on efi_memmap_alloc Zheng Zhi Yuan drivers: fix typo in firmware/efi/memmap.c Kuniyuki Iwashima tcp: Fix data races around icsk->icsk_af_ops. Kuniyuki Iwashima ipv6: Fix data races around sk->sk_prot. Eric Dumazet ipv6: annotate some data-races around sk->sk_prot Matthew Wilcox (Oracle) nfs: Leave pages in the pagecache if readpage failed Uwe Kleine-König pwm: stm32: Refuse too small period requests Arnd Bergmann syscalls: fix sys_fanotify_mark prototype Arnd Bergmann syscalls: fix compat_sys_io_pgetevents_time64 usage Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Niklas Cassel ata: ahci: Clean up sysfs file on error Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Janusz Krzysztofik drm/i915/gt: Fix potential UAF by revoke of fence registers Julia Zhang drm/amdgpu: avoid using null object of framebuffer Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Arnd Bergmann sh: rework sync_file_range ABI Dragan Simic kbuild: Install dtb files as 0644 in Makefile.dtbinst Yuntao Wang cpu/hotplug: Fix dynstate assignment in __cpuhp_setup_state_cpuslocked() Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Stefan Eichenberger serial: imx: set receiver level before starting uart Udit Kumar serial: 8250_omap: Implementation of Errata i2310 Meng Li usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: fix races against disable Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Alexander Sverdlin iio: accel: fxls8962af: select IIO_BUFFER & IIO_KFIFO_BUF Fernando Yang iio: adc: ad7266: Fix variable checking bug Wolfram Sang i2c: testunit: discard write requests while old command is running Wolfram Sang i2c: testunit: don't erase registers after STOP Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Jan Kara ocfs2: fix DIO failure due to insufficient transaction credits Arnd Bergmann parisc: use generic sys_fanotify_mark implementation Linus Torvalds x86: stop playing stack games in profile_pc() Kent Gibson gpiolib: cdev: Disallow reconfiguration without direction (uAPI v1) Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Liu Ying drm/panel: simple: Add missing display timing flags for KOE TX26D202VM0BWA Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Erick Archer drm/radeon/radeon_display: Decrease the size of allocated memory Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Joachim Vandersmissen crypto: ecdh - explicitly zeroize private_key Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Wenchao Hao RDMA/restrack: Fix potential invalid address access Anton Protopopov bpf: Add a check for struct bpf_fib_lookup size Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Uros Bizjak x86/fpu: Fix AMD X86_BUG_FXSAVE_LEAK fixup Maxime Coquelin vduse: Temporarily fail if control queue feature requested Maxime Coquelin vduse: validate block features only with block devices Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Christophe Leroy bpf: Take return from set_memory_ro() into account with bpf_prog_lock_ro() Yunseong Kim tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset() Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Neal Cardwell tcp: fix tcp_rcv_fastopen_synack() to enter TCP_CA_Loss for failed TFO Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() luoxuanqiang Fix race for duplicate reqsk on identical SYN Akhmat Karakotov tcp: Use BPF timeout setting for SYN ACK RTO Daniil Dulov xdp: Remove WARN() from __xdp_reg_mem_model() Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Nick Child ibmvnic: Free any outstanding tx skbs during scrq reset Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Oleksij Rempel net: stmmac: Assign configured channel value to EXTTS event Russell King (Oracle) net: mdio: add helpers to extract clause 45 regad and devad fields Alex Deucher drm/amdgpu: fix UBSAN warning in kv_dpm.c Steve French cifs: fix typo in module parameter enable_gcm_256 Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: use dedicated pinctrl type for RK3328 Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER John Keeping Input: ili210x - fix ili251x_read_touch_data() return value Ziwei Xiao gve: Clear napi->skb before dev_kfree_skb_any() David Awogbemila gve: Add RX context. Mario Limonciello ACPI: x86: Force StorageD3Enable on more products Mario Limonciello ACPI: x86: utils: Add Picasso to the list for forcing StorageD3Enable Jan Beulich x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node() Enzo Matsumiya smb: client: fix deadlock in smb2_find_smb_tcon() Yazen Ghannam x86/amd_nb: Check for invalid SMN reads Naveen Naidu PCI: Add PCI_ERROR_RESPONSE and related definitions Haifeng Xu perf/core: Fix missing wakeup when waiting for context reference Nam Cao riscv: fix overlap of allocated page and PTR_ERR Jisheng Zhang riscv: mm: init: try best to use IS_ENABLED(CONFIG_64BIT) instead of #ifdef Matthias Maennich kheaders: explicitly define file modes for archived headers Masahiro Yamada Revert "kheaders: substituting --sort in archive creation" Chris Wilson drm/i915/gt: Disarm breadcrumbs if engines are already idle Chris Wilson drm/i915/gt: Only kick the signal worker if there's been an update Nandor Kracser ksmbd: ignore trailing slashes in share paths Tony Luck x86/cpu: Fix x86_match_cpu() to match just X86_VENDOR_INTEL Tony Luck x86/cpu/vfm: Add new macros to work with (vendor/family/model) values Jeff Johnson tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test Matthew Mirvish bcache: fix variable length array abuse in btree_iter Tomi Valkeinen pmdomain: ti-sci: Fix duplicate PD referrals Bitterblue Smith wifi: rtlwifi: rtl8192de: Fix 5 GHz TX power Kees Cook rtlwifi: rtl8192de: Style clean-ups Krzysztof Kozlowski ARM: dts: samsung: smdk4412: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: smdkv310: fix keypad no-autorepeat Adrian Hunter perf script: Show also errors for --insn-trace option Changbin Du perf: script: add raw|disasm arguments to --insn-trace option Martin Leung drm/amd/display: revert Exit idle optimizations before HDCP execution Frank Li arm64: dts: imx8qm-mek: fix gpio number for reg_usdhc2_vmmc Krzysztof Kozlowski dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema Grygorii Tertychnyi i2c: ocores: set IACK bit after core is enabled Eric Dumazet tcp: clear tp->retrans_stamp in tcp_rcv_fastopen_synack() Aleksandr Nogikh kcov: don't lose track of remote references during softirqs Peter Oberparleiter gcov: add support for GCC 14 Alex Deucher drm/radeon: fix UBSAN warning in kv_dpm.c Jani Nikula drm/i915/mso: using joiner is not possible with eDP MSO Edson Juliano Drosdeck ALSA: hda/realtek: Limit mic boost on N14AP7 Sean Christopherson KVM: x86: Always sync PIR to IRR prior to scanning I/O APIC routes Boris Burkov btrfs: retry block group reclaim without infinite loop Ignat Korchagin net: do not leave a dangling sk pointer, when socket creation fails Erwan Le Ray serial: stm32: rework RX over DMA Patrisious Haddad RDMA/mlx5: Add check for srq max_sge attribute Raju Rangoju ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Kalle Niemi regulator: bd71815: fix ramp values Nikita Shubin dmaengine: ioatdma: Fix missing kmem_cache_destroy() Nikita Shubin dmaengine: ioatdma: Fix kmemleak in ioat_pci_probe() Nikita Shubin dmaengine: ioatdma: Fix error path in ioat3_dma_probe() Bjorn Helgaas dmaengine: ioat: use PCI core macros for PCIe Capability Nikita Shubin dmaengine: ioatdma: Fix leaking on version mismatch Bjorn Helgaas dmaengine: ioat: Drop redundant pci_enable_pcie_error_reporting() Qing Wang dmaengine: ioat: switch from 'pci_' to 'dma_' API Li RongQing dmaengine: idxd: Fix possible Use-After-Free in irq_process_work_list Biju Das regulator: core: Fix modpost error "regulator_get_regmap" undefined Oliver Neukum net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Pavan Chebbi bnxt_en: Restore PTP tx_avail count in case of skb_pad() error Jianguo Wu seg6: fix parameter passing when calling NF_HOOK() in End.DX4 and End.DX6 behaviors Jozsef Kadlecsik netfilter: ipset: Fix suspicious rcu_dereference_protected() Simon Horman octeontx2-pf: Add error handling to VLAN unoffload handling Heng Qi virtio_net: checksum offloading handling fix Xiaolei Wang net: stmmac: No need to calculate speed divider when offload is disabled Dan Carpenter ptp: fix integer overflow in max_vclocks_store Xin Long sched: act_ct: add netns into the key of tcf_ct_flow_table Vlad Buslov net/sched: act_ct: set 'net' pointer when creating new nf_flow_table Xin Long tipc: force a dst refcount before doing decryption David Ruth net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc() Pedro Tammela net/sched: act_api: rely on rcu in tcf_idr_check_alloc Stefan Wahren qca_spi: Make interrupt remembering atomic Yue Haibing netns: Make get_net_ns() handle zero refcount net Eric Dumazet xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Eric Dumazet ipv6: prevent possible NULL dereference in rt6_probe() Eric Dumazet ipv6: prevent possible NULL deref in fib6_nh_init() Gavrilov Ilia netrom: Fix a memory leak in nr_heartbeat_expiry() Ondrej Mosnacek cipso: fix total option length computation Masami Hiramatsu (Google) tracing: Build event generation tests only as modules Christian Marangi mips: bmips: BCM6358: make sure CBR is correctly set Ilpo Järvinen MIPS: Routerboard 532: Fix vendor retry check code Parker Newman serial: exar: adding missing CTI and Exar PCI ids Esben Haabendal serial: imx: Introduce timeout when waiting on transmitter empty Songyang Li MIPS: Octeon: Add PCIe link status check Mario Limonciello PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Roman Smirnov udf: udftime: prevent overflow in udf_disk_stamp_to_time() Joao Pinto Avoid hw_desc array overrun in dw-axi-dmac Alex Henrie usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Yunlei He f2fs: remove clear SB_INLINECRYPT flag in default_options Aleksandr Aprelkov iommu/arm-smmu-v3: Free MSIs in case of ENOMEM Tzung-Bi Shih power: supply: cros_usbpd: provide ID table for avoiding fallback match Michael Ellerman powerpc/io: Avoid clang null pointer arithmetic warnings Nathan Lynch powerpc/pseries: Enforce hcall result buffer validity and size Erico Nunes drm/lima: mask irqs in timeout path before hard reset Erico Nunes drm/lima: add mask irq callback to gp and pp Nicholas Kazlauskas drm/amd/display: Exit idle optimizations before HDCP execution Uri Arev Bluetooth: ath3k: Fix multiple issues reported by checkpatch.pl Takashi Iwai ACPI: video: Add backlight=native quirk for Lenovo Slim 7 16ARH7 Sean O'Brien HID: Add quirk for Logitech Casa touchpad Breno Leitao netpoll: Fix race condition in netpoll_owner_active Kunwu Chan kselftest: arm64: Add a null pointer check Manish Rangankar scsi: qedi: Fix crash while reading debugfs attribute Wander Lairson Costa drop_monitor: replace spin_lock by raw_spin_lock Eric Dumazet af_packet: avoid a false positive warning in packet_setsockopt() Arnd Bergmann wifi: ath9k: work around memset overflow warning Eric Dumazet batman-adv: bypass empty buckets in batadv_purge_orig_ref() Yonghong Song selftests/bpf: Fix flaky test btf_map_in_map/lookup_update Alessandro Carminati (Red Hat) selftests/bpf: Prevent client connect before server bind in test_tc_tunnel.sh Justin Stitt block/ioctl: prefer different overflow check Zqiang rcutorture: Fix invalid context warning when enable srcu barrier testing Zqiang rcutorture: Make stall-tasks directly exit when rcutorture tests end Paul E. McKenney rcutorture: Fix rcu_torture_one_read() pipe_count overflow comment Chenghai Huang crypto: hisilicon/sec - Fix memory leak for sec resource release Herbert Xu padata: Disable BH when taking works lock on MT path Johan Hovold Bluetooth: qca: fix info leak when fetching board id Dan Carpenter Bluetooth: qca: Fix error code in qca_read_fw_build_info() Oleg Nesterov zap_pid_ns_processes: clear TIF_NOTIFY_SIGNAL along with TIF_SIGPENDING Jean Delvare i2c: designware: Fix the functionality flags of the slave-only interface Jean Delvare i2c: at91: Fix the functionality flags of the slave-only interface Shichao Lai usb-storage: alauda: Check whether the media is initialized Sicong Huang greybus: Fix use-after-free bug in gb_interface_release due to race condition. Nathan Chancellor kbuild: Remove support for Clang's ThinLTO caching YonglongLi mptcp: pm: update add_addr counters after connect YonglongLi mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID Matthias Goergens hugetlb_encode.h: fix undefined behaviour (34 << 26) Doug Brown serial: 8250_pxa: Configure tx_loadsz to match FIFO IRQ level Miaohe Lin mm/huge_memory: don't unpoison huge_zero_folio Damien Le Moal scsi: mpi3mr: Fix ATA NCQ priority support Oleg Nesterov tick/nohz_full: Don't abuse smp_call_function_single() in tick_setup_device() Ryusuke Konishi nilfs2: fix potential kernel bug due to lack of writeback flag waiting Alexander Shishkin intel_th: pci: Add Lunar Lake support Alexander Shishkin intel_th: pci: Add Meteor Lake-S support Alexander Shishkin intel_th: pci: Add Sapphire Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids support Nuno Sa dmaengine: axi-dmac: fix possible race in remove() Rick Wertenbroek PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id Su Yue ocfs2: fix races between hole punching and AIO+DIO Su Yue ocfs2: use coarse time for new created files Rik van Riel fs/proc: fix softlockup in __read_vmcore Trond Myklebust knfsd: LOOKUP can return an illegal error value Vamshi Gajjela spmi: hisi-spmi-controller: Do not override device identifier Hagar Gamal Halim Hemdan vmci: prevent speculation leaks by sanitizing event in event_deliver() Thadeu Lima de Souza Cascardo sock_map: avoid race between sock_map_close and sk_psock_put Damien Le Moal null_blk: Print correct max open zones limit in null_init_zoned_dev() Steven Rostedt (Google) tracing/selftests: Fix kprobe event name test for .isra. functions Paolo Abeni mptcp: ensure snd_una is properly initialized on connect Marek Szyprowski drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found Jani Nikula drm/exynos/vidi: fix memory leak in .get_modes() Dirk Behme drivers: core: synchronize really_probe() and dev_uevent() Jean-Baptiste Maneyrol iio: imu: inv_icm42600: delete unneeded update watermark call Marc Ferland iio: dac: ad5592r: fix temperature channel scaling value David Lechner iio: adc: ad9467: fix scan type sign Rao Shoaib af_unix: Read with MSG_PEEK loops if the first unread byte is OOB Taehee Yoo ionic: fix use after netif_napi_del() Petr Pavlu net/ipv6: Fix the RT cache flush via sysctl using a previous delay Xiaolei Wang net: stmmac: replace priv->speed with the portTransmitRate from the tc-cbs parameters Jozsef Kadlecsik netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type Luiz Augusto von Dentz Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ Gal Pressman net/mlx5e: Fix features validation check for tunneled UDP (non-VXLAN) packets Eric Dumazet tcp: fix race in tcp_v6_syn_recv_sock() Adam Miotk drm/bridge/panel: Fix runtime warning on panel bridge release Amjad Ouled-Ameur drm/komeda: check for error-valued pointer Aleksandr Mishin liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet Jie Wang net: hns3: add cond_resched() to hns3 ring buffer init process Yonglong Liu net: hns3: fix kernel crash problem in concurrent scenario Csókás, Bence net: sfp: Always call `sfp_sm_mod_remove()` on remove Ian Forbes drm/vmwgfx: 3D disabled should not effect STDU memory limits José Expósito HID: logitech-dj: Fix memory leak in logi_dj_recv_switch_to_dj_mode() Lu Baolu iommu: Return right value in iommu_sva_bind_device() Kun(llfl) iommu/amd: Fix sysfs leak in iommu init Vasant Hegde iommu/amd: Introduce pci segment structure Nikita Zhandarovich HID: core: remove unnecessary WARN_ON() in implement() Matthias Schiffer gpio: tqmx86: store IRQ trigger type and unmask status separately Gregor Herburger gpio: tqmx86: fix typo in Kconfig label Armin Wolf platform/x86: dell-smbios: Fix wrong token data in sysfs ye xingchen platform/x86: dell-smbios-base: Use sysfs_emit() Chen Hanxiao SUNRPC: return proper error from gss_wrap_req_priv Samuel Holland clk: sifive: Do not register clkdevs for PRCI clocks Dmitry Torokhov Input: try trimming too long modalias strings Michael Ellerman powerpc/uaccess: Fix build errors seen with GCC 13/14 Breno Leitao scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory Kuangyi Chiang xhci: Apply broken streams quirk to Etron EJ188 xHCI host Hector Martin xhci: Handle TD clearing for multiple streams case Kuangyi Chiang xhci: Apply reset resume quirk to Etron EJ188 xHCI host Mathias Nyman xhci: Set correct transferred length for cancelled bulk transfers Greg Kroah-Hartman jfs: xattr: fix buffer overflow for invalid xattr Tomas Winkler mei: me: release irq in mei_me_pci_resume error path Kyle Tso usb: typec: tcpm: Ignore received Hard Reset in TOGGLING state Alan Stern USB: class: cdc-wdm: Fix CPU lockup caused by excessive log messages Ryusuke Konishi nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors Matthew Wilcox (Oracle) nilfs2: return the mapped address from nilfs_get_page() Matthew Wilcox (Oracle) nilfs2: Remove check for PageError Filipe Manana btrfs: fix leak of qgroup extent records after transaction abort Dmitry Baryshkov wifi: ath10k: fix QCOM_RPROC_COMMON dependency Dev Jain selftests/mm: compaction_test: fix bogus test success on Aarch64 Mark Brown selftests/mm: log a consistent test name for check_compaction Muhammad Usama Anjum selftests/mm: conform test to TAP format output Dev Jain selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages Frank van der Linden mm/cma: drop incorrect alignment check in cma_init_reserved_mem David Hildenbrand cma: factor out minimum alignment requirement Hamish Martin i2c: acpi: Unbind mux adapters before delete Russell King (Oracle) i2c: add fwnode APIs Uwe Kleine-König mmc: davinci: Don't strip remove function when driver is builtin Yangtao Li mmc: davinci_mmc: Convert to platform remove callback returning void Zheng Yejian ftrace: Fix possible use-after-free issue in ftrace_location() Peter Zijlstra x86/ibt,ftrace: Search for __fentry__ location Hugo Villeneuve serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler Hugo Villeneuve serial: sc16is7xx: replace hardcoded divisor value with BIT() macro Johan Hovold Bluetooth: qca: fix info leak when fetching fw build id Tim Jiang Bluetooth: qca: add support for QCA2066 Neil Armstrong Bluetooth: qca: use switch case for soc type behavior Luca Weiss Bluetooth: btqca: Add WCN3988 support Min-Hua Chen Bluetooth: btqca: use le32_to_cpu for ver.soc_id Krzysztof Kozlowski Bluetooth: hci_qca: mark OF related data as maybe unused Luiz Augusto von Dentz skbuff: introduce skb_pull_data Thomas Weißschuh misc/pvpanic-pci: register attributes via pci_driver Thomas Weißschuh misc/pvpanic: deduplicate common code Andy Shevchenko pvpanic: Indentation fixes here and there Andy Shevchenko pvpanic: Keep single style across modules Hersen Wu drm/amd/display: Fix incorrect DSC instance for MST Alexey Kodanev drm/amd/display: drop unnecessary NULL checks in debugfs Jiapeng Chong drm/amd/display: Clean up some inconsistent indenting George Shen drm/amd/display: Handle Y carry-over in VCP X.Y calculation Hans de Goede iio: accel: mxc4005: Reset chip on probe() and resume() Wesley Cheng usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete John Keeping usb: gadget: f_fs: use io_data->status consistently Eric Dumazet ipv6: fix possible race in __fib6_drop_pcpu_from() Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_shutdown in sk_diag_fill(). Kuniyuki Iwashima af_unix: Use skb_queue_len_lockless() in sk_diag_show_rqlen(). Kuniyuki Iwashima af_unix: Use skb_queue_empty_lockless() in unix_release_sock(). Eric Dumazet af_unix: annotate lockless accesses to sk->sk_err Kuniyuki Iwashima af_unix: Use unix_recvq_full_lockless() in unix_stream_connect(). Kuniyuki Iwashima af_unix: Annotate data-race of net->unx.sysctl_max_dgram_qlen. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in UNIX_DIAG. Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_stream_read_skb(). Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in sendmsg() and recvmsg(). Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_stream_connect(). Eric Dumazet net: drop nopreempt requirement on sock_prot_inuse_add() Eric Dumazet net: inline sock_prot_inuse_add() Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in unix_write_space() and poll(). Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_inq_len(). Kuniyuki Iwashima af_unix: Annodate data-races around sk->sk_state for writers. Kuniyuki Iwashima af_unix: Set sk->sk_state under unix_state_lock() for truly disconencted peer. Karol Kolacinski ptp: Fix error message on failed pin verification Eric Dumazet net/sched: taprio: always validate TCA_TAPRIO_ATTR_PRIOMAP Jason Xing tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB Daniel Borkmann vxlan: Fix regression when dropping packets due to invalid src addresses Hangyu Hua net: sched: sch_multiq: fix possible OOB write in multiq_tune() Subbaraya Sundeep octeontx2-af: Always allocate PF entries from low prioriy zone Jiri Olsa bpf: Set run context for rawtp test_run callback Eric Dumazet ipv6: sr: block BH in seg6_output_core() and seg6_input_core() DelphineCCChiu net/ncsi: Fix the multi thread manner of NCSI driver Peter Delevoryas net/ncsi: Simplify Kconfig/dts control flow Lingbo Kong wifi: mac80211: correctly parse Spatial Reuse Parameter Set element Emmanuel Grumbach wifi: iwlwifi: mvm: don't read past the mfuart notifcation Miri Korenblit wifi: iwlwifi: mvm: check n_ssids before accessing the ssids Shahar S Matityahu wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Johannes Berg wifi: iwlwifi: mvm: revert gen2 TX A-MPDU size to 64 Lin Ma wifi: cfg80211: pmsr: use correct nla_get_uX functions Remi Pommarel wifi: cfg80211: Lock wiphy in cfg80211_get_station Remi Pommarel wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() Nicolas Escande wifi: mac80211: mesh: Fix leak of mesh_preq_queue objects ------------- Diffstat: .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- Makefile | 9 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/rk3066a.dtsi | 1 + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kvm/arm.c | 6 +- arch/arm64/kvm/vgic/vgic-v3.c | 2 +- arch/arm64/kvm/vgic/vgic-v4.c | 8 +- arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/mips/bmips/setup.c | 3 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/mips/pci/ops-rc32434.c | 4 +- arch/mips/pci/pcie-octeon.c | 6 + arch/parisc/Kconfig | 1 + arch/parisc/kernel/sys_parisc32.c | 9 - arch/parisc/kernel/syscalls/syscall.tbl | 6 +- arch/powerpc/include/asm/fadump-internal.h | 5 - arch/powerpc/include/asm/hvcall.h | 8 +- arch/powerpc/include/asm/io.h | 24 +- arch/powerpc/include/asm/uaccess.h | 15 +- arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/kernel/syscalls/syscall.tbl | 2 +- arch/riscv/mm/init.c | 58 ++--- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/sh/kernel/sys_sh32.c | 11 + arch/sh/kernel/syscalls/syscall.tbl | 3 +- arch/sparc/kernel/sys32.S | 221 ----------------- arch/sparc/kernel/syscalls/syscall.tbl | 8 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/include/asm/cpu_device_id.h | 98 ++++++++ arch/x86/include/asm/efi.h | 11 + arch/x86/kernel/amd_nb.c | 9 +- arch/x86/kernel/cpu/match.c | 4 +- arch/x86/kernel/fpu/core.c | 4 +- arch/x86/kernel/kprobes/core.c | 11 +- arch/x86/kernel/time.c | 20 +- arch/x86/kvm/x86.c | 9 +- arch/x86/mm/numa.c | 6 +- arch/x86/platform/efi/Makefile | 3 +- arch/x86/platform/efi/efi.c | 8 +- arch/x86/platform/efi/memmap.c | 249 +++++++++++++++++++ block/ioctl.c | 2 +- crypto/ecdh.c | 2 + drivers/acpi/acpica/exregion.c | 23 +- drivers/acpi/video_detect.c | 8 + drivers/acpi/x86/utils.c | 23 +- drivers/ata/ahci.c | 17 +- drivers/ata/libata-core.c | 8 +- drivers/base/core.c | 3 + drivers/block/null_blk/zoned.c | 2 +- drivers/bluetooth/ath3k.c | 25 +- drivers/bluetooth/btqca.c | 186 +++++++++++--- drivers/bluetooth/btqca.h | 36 +-- drivers/bluetooth/hci_qca.c | 266 ++++++++++++++++----- drivers/clk/sifive/sifive-prci.c | 8 - drivers/crypto/hisilicon/sec2/sec_crypto.c | 4 +- drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 6 +- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + drivers/dma/idxd/irq.c | 4 +- drivers/dma/ioat/init.c | 73 +++--- drivers/dma/ioat/registers.h | 7 - drivers/firmware/efi/fdtparams.c | 4 + drivers/firmware/efi/memmap.c | 239 +----------------- drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-davinci.c | 5 + drivers/gpio/gpio-tqmx86.c | 46 ++-- drivers/gpio/gpiolib-cdev.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 18 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 144 +++++------ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 + drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 2 + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- drivers/gpu/drm/bridge/panel.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +- drivers/gpu/drm/i915/display/intel_dp.c | 4 + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 16 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + drivers/gpu/drm/lima/lima_bcast.c | 12 + drivers/gpu/drm/lima/lima_bcast.h | 3 + drivers/gpu/drm/lima/lima_gp.c | 8 + drivers/gpu/drm/lima/lima_pp.c | 18 ++ drivers/gpu/drm/lima/lima_sched.c | 7 + drivers/gpu/drm/lima/lima_sched.h | 1 + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/radeon/radeon.h | 1 - drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 - drivers/greybus/interface.c | 1 + drivers/hid/hid-core.c | 1 - drivers/hid/hid-ids.h | 1 + drivers/hid/hid-logitech-dj.c | 4 +- drivers/hid/hid-multitouch.c | 6 + drivers/hwtracing/intel_th/pci.c | 25 ++ drivers/i2c/busses/i2c-at91-slave.c | 3 +- drivers/i2c/busses/i2c-designware-slave.c | 2 +- drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/i2c/i2c-core-acpi.c | 30 +-- drivers/i2c/i2c-core-base.c | 98 ++++++++ drivers/i2c/i2c-core-of.c | 66 ----- drivers/i2c/i2c-slave-testunit.c | 5 +- drivers/iio/accel/Kconfig | 2 + drivers/iio/accel/mxc4005.c | 68 ++++++ drivers/iio/adc/ad7266.c | 2 + drivers/iio/adc/ad9467.c | 4 +- drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 ++++- drivers/iio/dac/ad5592r-base.c | 2 +- drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 4 - drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 4 - drivers/infiniband/core/restrack.c | 51 +--- drivers/infiniband/hw/mlx5/srq.c | 13 +- drivers/input/input.c | 105 ++++++-- drivers/input/touchscreen/ili210x.c | 4 +- drivers/iommu/amd/amd_iommu_types.h | 24 +- drivers/iommu/amd/init.c | 55 ++++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/md/bcache/bset.c | 44 ++-- drivers/md/bcache/bset.h | 28 ++- drivers/md/bcache/btree.c | 40 ++-- drivers/md/bcache/super.c | 5 +- drivers/md/bcache/sysfs.c | 2 +- drivers/md/bcache/writeback.c | 10 +- drivers/media/dvb-core/dvbdev.c | 2 +- drivers/misc/mei/pci-me.c | 4 +- drivers/misc/pvpanic/pvpanic-mmio.c | 59 +---- drivers/misc/pvpanic/pvpanic-pci.c | 80 +------ drivers/misc/pvpanic/pvpanic.c | 90 ++++++- drivers/misc/pvpanic/pvpanic.h | 10 +- drivers/misc/vmw_vmci/vmci_event.c | 6 +- drivers/mmc/host/davinci_mmc.c | 6 +- drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci.c | 25 +- drivers/mtd/parsers/redboot.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 7 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 11 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/google/gve/gve.h | 13 +- drivers/net/ethernet/google/gve/gve_rx_dqo.c | 76 +++--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 21 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 33 ++- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/ethernet/qualcomm/qca_debug.c | 6 +- drivers/net/ethernet/qualcomm/qca_spi.c | 16 +- drivers/net/ethernet/qualcomm/qca_spi.h | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 55 ++--- drivers/net/phy/micrel.c | 1 + drivers/net/phy/sfp.c | 3 +- drivers/net/usb/ax88179_178a.c | 6 +- drivers/net/usb/rtl8150.c | 3 +- drivers/net/virtio_net.c | 12 +- drivers/net/vxlan/vxlan_core.c | 4 + drivers/net/wireless/ath/ath.h | 6 +- drivers/net/wireless/ath/ath10k/Kconfig | 1 + drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 - drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 9 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 19 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - drivers/of/of_reserved_mem.c | 9 +- drivers/pci/controller/pcie-rockchip-ep.c | 6 +- drivers/pci/pci.c | 12 + drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 68 +++++- drivers/pinctrl/pinctrl-rockchip.h | 1 + drivers/platform/x86/dell/dell-smbios-base.c | 91 +++---- drivers/power/supply/cros_usbpd-charger.c | 11 +- drivers/ptp/ptp_chardev.c | 3 +- drivers/ptp/ptp_sysfs.c | 3 +- drivers/pwm/pwm-stm32.c | 3 + drivers/regulator/bd71815-regulator.c | 2 +- drivers/regulator/core.c | 1 + drivers/scsi/mpi3mr/mpi3mr.h | 1 + drivers/scsi/mpi3mr/mpi3mr_os.c | 67 ++++++ drivers/scsi/mpt3sas/mpt3sas_base.c | 19 ++ drivers/scsi/mpt3sas/mpt3sas_base.h | 3 - drivers/scsi/mpt3sas/mpt3sas_ctl.c | 4 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 25 -- drivers/scsi/qedi/qedi_debugfs.c | 12 +- drivers/scsi/scsi_transport_sas.c | 29 +++ drivers/soc/ti/ti_sci_pm_domains.c | 20 +- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/spmi/hisi-spmi-controller.c | 1 - drivers/tty/serial/8250/8250_exar.c | 42 ++++ drivers/tty/serial/8250/8250_omap.c | 25 +- drivers/tty/serial/8250/8250_pxa.c | 1 + drivers/tty/serial/imx.c | 11 +- drivers/tty/serial/mcf.c | 2 +- drivers/tty/serial/sc16is7xx.c | 25 +- drivers/tty/serial/stm32-usart.c | 208 ++++++++++++---- drivers/tty/serial/stm32-usart.h | 12 +- drivers/usb/atm/cxacru.c | 14 ++ drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/dwc3/core.c | 6 - drivers/usb/gadget/function/f_fs.c | 9 +- drivers/usb/gadget/function/f_printer.c | 40 +++- drivers/usb/host/xhci-pci.c | 7 + drivers/usb/host/xhci-ring.c | 59 +++-- drivers/usb/host/xhci.h | 1 + drivers/usb/misc/uss720.c | 22 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/storage/alauda.c | 9 +- drivers/usb/typec/tcpm/tcpm.c | 1 + drivers/vdpa/vdpa_user/vduse_dev.c | 14 +- fs/btrfs/block-group.c | 11 +- fs/btrfs/disk-io.c | 10 +- fs/cifs/cifsfs.c | 2 +- fs/cifs/smb2transport.c | 2 +- fs/f2fs/super.c | 2 - fs/jfs/xattr.c | 4 +- fs/ksmbd/mgmt/share_config.c | 6 +- fs/nfs/read.c | 4 - fs/nfsd/nfsfh.c | 4 +- fs/nilfs2/dir.c | 59 +++-- fs/nilfs2/segment.c | 3 + fs/ocfs2/aops.c | 5 + fs/ocfs2/file.c | 2 + fs/ocfs2/journal.c | 17 ++ fs/ocfs2/journal.h | 2 + fs/ocfs2/namei.c | 2 +- fs/ocfs2/ocfs2_trace.h | 2 + fs/open.c | 4 +- fs/proc/vmcore.c | 2 + fs/udf/udftime.c | 11 +- include/kvm/arm_vgic.h | 2 +- include/linux/cma.h | 9 + include/linux/compat.h | 2 +- include/linux/efi.h | 10 +- include/linux/filter.h | 5 +- include/linux/i2c.h | 26 +- include/linux/iommu.h | 2 +- include/linux/kcov.h | 2 + include/linux/mdio.h | 12 + include/linux/mod_devicetable.h | 2 + include/linux/nvme.h | 4 +- include/linux/pci.h | 9 + include/linux/skbuff.h | 2 + include/linux/syscalls.h | 8 +- include/net/bluetooth/hci_core.h | 36 ++- include/net/inet_connection_sock.h | 10 +- include/net/netfilter/nf_tables.h | 5 + include/net/request_sock.h | 2 + include/net/sock.h | 16 +- include/net/tcp.h | 2 +- include/scsi/scsi_transport_sas.h | 2 + include/trace/events/qdisc.h | 2 +- include/uapi/asm-generic/hugetlb_encode.h | 26 +- include/uapi/asm-generic/unistd.h | 2 +- kernel/bpf/core.c | 4 +- kernel/bpf/trampoline.c | 20 +- kernel/bpf/verifier.c | 8 +- kernel/cpu.c | 8 +- kernel/dma/contiguous.c | 4 +- kernel/events/core.c | 13 + kernel/gcov/gcc_4_7.c | 4 +- kernel/gen_kheaders.sh | 9 +- kernel/kcov.c | 1 + kernel/kprobes.c | 8 +- kernel/padata.c | 8 +- kernel/pid_namespace.c | 1 + kernel/rcu/rcutorture.c | 16 +- kernel/sys_ni.c | 2 +- kernel/time/tick-common.c | 42 ++-- kernel/trace/Kconfig | 4 +- kernel/trace/ftrace.c | 71 ++++-- kernel/trace/preemptirq_delay_test.c | 1 + mm/cma.c | 20 +- mm/memory-failure.c | 7 + net/batman-adv/originator.c | 29 +++ net/bluetooth/l2cap_core.c | 8 +- net/bpf/test_run.c | 6 + net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/drop_monitor.c | 20 +- net/core/filter.c | 3 + net/core/net_namespace.c | 9 +- net/core/netpoll.c | 2 +- net/core/skbuff.c | 24 ++ net/core/sock.c | 20 +- net/core/sock_map.c | 16 +- net/core/xdp.c | 4 +- net/dccp/ipv4.c | 7 +- net/dccp/ipv6.c | 7 +- net/ieee802154/socket.c | 4 +- net/ipv4/af_inet.c | 23 +- net/ipv4/cipso_ipv4.c | 12 +- net/ipv4/inet_connection_sock.c | 22 +- net/ipv4/raw.c | 2 +- net/ipv4/tcp.c | 16 +- net/ipv4/tcp_input.c | 50 +++- net/ipv4/tcp_minisocks.c | 5 +- net/ipv6/af_inet6.c | 24 +- net/ipv6/ip6_fib.c | 6 +- net/ipv6/ipv6_sockglue.c | 17 +- net/ipv6/route.c | 9 +- net/ipv6/seg6_iptunnel.c | 14 +- net/ipv6/seg6_local.c | 8 +- net/ipv6/tcp_ipv6.c | 9 +- net/ipv6/xfrm6_policy.c | 8 +- net/iucv/iucv.c | 26 +- net/mac80211/he.c | 10 +- net/mac80211/mesh_pathtbl.c | 13 + net/mac80211/sta_info.c | 4 +- net/mptcp/pm_netlink.c | 21 +- net/mptcp/protocol.c | 1 + net/ncsi/internal.h | 2 + net/ncsi/ncsi-manage.c | 95 ++++---- net/ncsi/ncsi-rsp.c | 4 +- net/netfilter/ipset/ip_set_core.c | 104 ++++---- net/netfilter/ipset/ip_set_list_set.c | 30 ++- net/netfilter/nf_tables_api.c | 8 +- net/netfilter/nft_lookup.c | 3 +- net/netlink/af_netlink.c | 4 - net/netrom/nr_timer.c | 3 +- net/packet/af_packet.c | 30 ++- net/sched/act_api.c | 66 +++-- net/sched/act_ct.c | 21 +- net/sched/sch_multiq.c | 2 +- net/sched/sch_taprio.c | 15 +- net/sctp/socket.c | 5 - net/smc/af_smc.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 4 +- net/tipc/node.c | 1 + net/unix/af_unix.c | 113 +++++---- net/unix/diag.c | 12 +- net/wireless/pmsr.c | 8 +- net/wireless/util.c | 7 +- net/xdp/xsk.c | 4 - scripts/Makefile.dtbinst | 2 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/synth/emux/soundfont.c | 17 +- tools/include/asm-generic/hugetlb_encode.h | 26 +- tools/perf/Documentation/perf-script.txt | 7 +- tools/perf/builtin-script.c | 24 +- tools/testing/selftests/arm64/tags/tags_test.c | 4 + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +- tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- .../ftrace/test.d/kprobe/kprobe_eventname.tc | 3 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +- tools/testing/selftests/vm/compaction_test.c | 108 +++++---- 364 files changed, 3886 insertions(+), 2550 deletions(-) . From: Sascha Hauer To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , Guenter Roeck , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pengutronix Kernel Team , Sascha Hauer Subject: [PATCH] watchdog: imx7ulp_wdt: keep already running watchdog enabled Date: Wed, 3 Jul 2024 13:16:03 +0200 Message-Id: <20240703111603.1096424-1-s.hauer@pengutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266455 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-watchdog Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail When the bootloader enabled the watchdog before Kernel started then keep it enabled during initialization. Otherwise the time between the watchdog probing and the userspace taking over the watchdog won't be covered by the watchdog. When keeping the watchdog enabled inform the Kernel about this by setting the WDOG_HW_RUNNING so that the periodic watchdog feeder is started when desired. Signed-off-by: Sascha Hauer --- drivers/watchdog/imx7ulp_wdt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c index b21d7a74a42df..94914a22daff7 100644 --- a/drivers/watchdog/imx7ulp_wdt.c +++ b/drivers/watchdog/imx7ulp_wdt.c @@ -290,6 +290,11 @@ static int imx7ulp_wdt_init(struct imx7ulp_wdt_device *wdt, unsigned int timeout if (wdt->ext_reset) val |= WDOG_CS_INT_EN; + if (readl(wdt->base + WDOG_CS) & WDOG_CS_EN) { + set_bit(WDOG_HW_RUNNING, &wdt->wdd.status); + val |= WDOG_CS_EN; + } + do { ret = _imx7ulp_wdt_init(wdt, timeout, val); toval = readl(wdt->base + WDOG_TOVAL); -- 2.39.2 . From: Aditya Garg To: Jiri Kosina , "bentiss@kernel.org" CC: Orlando Chamberlain , "linux-input@vger.kernel.org" , Linux Kernel Mailing List Subject: [PATCH v2] HID: apple: Add support for magic keyboard backlight on T2 Macs Date: Wed, 3 Jul 2024 11:18:12 +0000 Message-ID: <16C35623-78AE-44B9-8D54-CA9584AEC49E@live.com> Accept-Language: en-IN, en-US Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266456 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-input Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Orlando Chamberlain Unlike T2 Macs with Butterfly keyboard, who have their keyboard backlight on the USB device the T2 Macs with Magic keyboard have their backlight on the Touchbar backlight device (05ac:8102). Support for Butterfly keyboards has already been added in 9018eacbe623 ("HID: apple: Add support for keyboard backlight on certain T2 Macs."). This patch adds support for the Magic keyboards. Co-developed-by: Aditya Garg Signed-off-by: Aditya Garg Signed-off-by: Orlando Chamberlain --- drivers/hid/hid-apple.c | 87 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index bd022e004356..2d1cd4456303 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -8,6 +8,8 @@ * Copyright (c) 2006-2007 Jiri Kosina * Copyright (c) 2008 Jiri Slaby * Copyright (c) 2019 Paul Pawlowski + * Copyright (c) 2023 Orlando Chamberlain + * Copyright (c) 2024 Aditya Garg */ =20 /* @@ -23,6 +25,7 @@ #include #include #include +#include =20 #include "hid-ids.h" =20 @@ -37,13 +40,18 @@ #define APPLE_NUMLOCK_EMULATION BIT(8) #define APPLE_RDESC_BATTERY BIT(9) #define APPLE_BACKLIGHT_CTL BIT(10) -#define APPLE_IS_NON_APPLE BIT(11) +#define APPLE_MAGIC_BACKLIGHT BIT(11) +#define APPLE_IS_NON_APPLE BIT(12) =20 #define APPLE_FLAG_FKEY 0x01 =20 #define HID_COUNTRY_INTERNATIONAL_ISO 13 #define APPLE_BATTERY_TIMEOUT_MS 60000 =20 +#define HID_USAGE_MAGIC_BL 0xff00000f +#define APPLE_MAGIC_REPORT_ID_POWER 3 +#define APPLE_MAGIC_REPORT_ID_BRIGHTNESS 1 + static unsigned int fnmode =3D 3; module_param(fnmode, uint, 0644); MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 =3D disable= d, " @@ -81,6 +89,12 @@ struct apple_sc_backlight { struct hid_device *hdev; }; =20 +struct apple_magic_backlight { + struct led_classdev cdev; + struct hid_report *brightness; + struct hid_report *power; +}; + struct apple_sc { struct hid_device *hdev; unsigned long quirks; @@ -822,6 +836,66 @@ static int apple_backlight_init(struct hid_device *hde= v) return ret; } =20 +static void apple_magic_backlight_report_set(struct hid_report *rep, s32 v= alue, u8 rate) +{ + rep->field[0]->value[0] =3D value; + rep->field[1]->value[0] =3D 0x5e; /* Mimic Windows */ + rep->field[1]->value[0] |=3D rate << 8; + + hid_hw_request(rep->device, rep, HID_REQ_SET_REPORT); +} + +static void apple_magic_backlight_set(struct apple_magic_backlight *backli= ght, + int brightness, char rate) +{ + apple_magic_backlight_report_set(backlight->power, brightness ? 1 : 0, ra= te); + if (brightness) + apple_magic_backlight_report_set(backlight->brightness, brightness, rate= ); +} + +static int apple_magic_backlight_led_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + struct apple_magic_backlight *backlight =3D container_of(led_cdev, + struct apple_magic_backlight, cdev); + + apple_magic_backlight_set(backlight, brightness, 1); + return 0; +} + +static int apple_magic_backlight_init(struct hid_device *hdev) +{ + struct apple_magic_backlight *backlight; + + /* + * Ensure this usb endpoint is for the keyboard backlight, not touchbar + * backlight. + */ + if (hdev->collection[0].usage !=3D HID_USAGE_MAGIC_BL) + return -ENODEV; + + backlight =3D devm_kzalloc(&hdev->dev, sizeof(*backlight), GFP_KERNEL); + if (!backlight) + return -ENOMEM; + + backlight->brightness =3D hid_register_report(hdev, HID_FEATURE_REPORT, + APPLE_MAGIC_REPORT_ID_BRIGHTNESS, 0); + backlight->power =3D hid_register_report(hdev, HID_FEATURE_REPORT, + APPLE_MAGIC_REPORT_ID_POWER, 0); + + if (!backlight->brightness || !backlight->power) + return -ENODEV; + + backlight->cdev.name =3D ":white:" LED_FUNCTION_KBD_BACKLIGHT; + backlight->cdev.max_brightness =3D backlight->brightness->field[0]->logic= al_maximum; + backlight->cdev.brightness_set_blocking =3D apple_magic_backlight_led_set= ; + + apple_magic_backlight_set(backlight, 0, 0); + + return devm_led_classdev_register(&hdev->dev, &backlight->cdev); + +} + static int apple_probe(struct hid_device *hdev, const struct hid_device_id *id) { @@ -860,6 +934,15 @@ static int apple_probe(struct hid_device *hdev, if (quirks & APPLE_BACKLIGHT_CTL) apple_backlight_init(hdev); =20 + if (quirks & APPLE_MAGIC_BACKLIGHT) { + ret =3D apple_magic_backlight_init(hdev); + if (ret) { + del_timer_sync(&asc->battery_timer); + hid_hw_stop(hdev); + return ret; + } + } + return 0; } =20 @@ -1073,6 +1156,8 @@ static const struct hid_device_id apple_devices[] =3D= { .driver_data =3D APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATT= ERY }, { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYB= OARD_NUMPAD_2021), .driver_data =3D APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLI= GHT), + .driver_data =3D APPLE_MAGIC_BACKLIGHT }, =20 { } }; --=20 2.45.2 . From: Aleksandr Mishin To: Daejun Park , , Greg Kroah-Hartman CC: Aleksandr Mishin , Alim Akhtar , Avri Altman , Bart Van Assche , "James E.J. Bottomley" , "Martin K. Petersen" , Can Guo , Bean Huo , , , Subject: [PATCH 6.1] scsi: ufs: ufshpb: Fix NULL deallocation in ufshpb_pre_req_mempool_destroy() Date: Wed, 3 Jul 2024 14:17:51 +0300 Message-ID: <20240703111751.23377-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186303 [Jul 03 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, mx1.t-argos.ru.ru:7.1.1;t-argos.ru:7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/03 07:47:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/03 06:16:00 #25818842 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266459 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-scsi,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail No upstream commit exists for this commit. The issue was introduced with commit 41d8a9333cc9 ("scsi: ufs: ufshpb: Add HPB 2.0 support"). In ufshpb_pre_req_mempool_destroy() __free_page() is called only if pointer contains NULL value. Fix this bug by modifying check condition. Upstream branch code has been significantly refactored and can't be backported directly. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 41d8a9333cc9 ("scsi: ufs: ufshpb: Add HPB 2.0 support") Signed-off-by: Aleksandr Mishin --- drivers/ufs/core/ufshpb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ufs/core/ufshpb.c b/drivers/ufs/core/ufshpb.c index b7f412d0f301..c649e8a10a23 100644 --- a/drivers/ufs/core/ufshpb.c +++ b/drivers/ufs/core/ufshpb.c @@ -2120,7 +2120,7 @@ static void ufshpb_pre_req_mempool_destroy(struct ufshpb_lu *hpb) for (i = 0; i < hpb->throttle_pre_req; i++) { pre_req = hpb->pre_req + i; bio_put(hpb->pre_req[i].bio); - if (!pre_req->wb.m_page) + if (pre_req->wb.m_page) __free_page(hpb->pre_req[i].wb.m_page); list_del_init(&pre_req->list_req); } -- 2.30.2 . From: Maarten Lankhorst To: linux-mm@kvack.org, cgroups@vger.kernel.org, Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song Cc: linux-kernel@vger.kernel.org, Maarten Lankhorst Subject: [PATCH] mm/page_counter: Move calculating protection values to page_counter Date: Wed, 3 Jul 2024 13:25:10 +0200 Message-ID: <20240703112510.36424-1-maarten.lankhorst@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266466 org.kvack.linux-mm:202352 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail It's a lot of math, and there is nothing memcontrol specific about it. This makes it easier to use inside of the drm cgroup controller. Signed-off-by: Maarten Lankhorst Acked-by: Roman Gushchin Acked-by: Shakeel Butt --- include/linux/page_counter.h | 4 + mm/memcontrol.c | 154 +------------------------------ mm/page_counter.c | 173 +++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 151 deletions(-) diff --git a/include/linux/page_counter.h b/include/linux/page_counter.h index 8cd858d912c4..904c52f97284 100644 --- a/include/linux/page_counter.h +++ b/include/linux/page_counter.h @@ -81,4 +81,8 @@ static inline void page_counter_reset_watermark(struct page_counter *counter) counter->watermark = page_counter_read(counter); } +void page_counter_calculate_protection(struct page_counter *root, + struct page_counter *counter, + bool recursive_protection); + #endif /* _LINUX_PAGE_COUNTER_H */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 71fe2a95b8bd..9454e1a3120e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7316,122 +7316,6 @@ struct cgroup_subsys memory_cgrp_subsys = { .early_init = 0, }; -/* - * This function calculates an individual cgroup's effective - * protection which is derived from its own memory.min/low, its - * parent's and siblings' settings, as well as the actual memory - * distribution in the tree. - * - * The following rules apply to the effective protection values: - * - * 1. At the first level of reclaim, effective protection is equal to - * the declared protection in memory.min and memory.low. - * - * 2. To enable safe delegation of the protection configuration, at - * subsequent levels the effective protection is capped to the - * parent's effective protection. - * - * 3. To make complex and dynamic subtrees easier to configure, the - * user is allowed to overcommit the declared protection at a given - * level. If that is the case, the parent's effective protection is - * distributed to the children in proportion to how much protection - * they have declared and how much of it they are utilizing. - * - * This makes distribution proportional, but also work-conserving: - * if one cgroup claims much more protection than it uses memory, - * the unused remainder is available to its siblings. - * - * 4. Conversely, when the declared protection is undercommitted at a - * given level, the distribution of the larger parental protection - * budget is NOT proportional. A cgroup's protection from a sibling - * is capped to its own memory.min/low setting. - * - * 5. However, to allow protecting recursive subtrees from each other - * without having to declare each individual cgroup's fixed share - * of the ancestor's claim to protection, any unutilized - - * "floating" - protection from up the tree is distributed in - * proportion to each cgroup's *usage*. This makes the protection - * neutral wrt sibling cgroups and lets them compete freely over - * the shared parental protection budget, but it protects the - * subtree as a whole from neighboring subtrees. - * - * Note that 4. and 5. are not in conflict: 4. is about protecting - * against immediate siblings whereas 5. is about protecting against - * neighboring subtrees. - */ -static unsigned long effective_protection(unsigned long usage, - unsigned long parent_usage, - unsigned long setting, - unsigned long parent_effective, - unsigned long siblings_protected) -{ - unsigned long protected; - unsigned long ep; - - protected = min(usage, setting); - /* - * If all cgroups at this level combined claim and use more - * protection than what the parent affords them, distribute - * shares in proportion to utilization. - * - * We are using actual utilization rather than the statically - * claimed protection in order to be work-conserving: claimed - * but unused protection is available to siblings that would - * otherwise get a smaller chunk than what they claimed. - */ - if (siblings_protected > parent_effective) - return protected * parent_effective / siblings_protected; - - /* - * Ok, utilized protection of all children is within what the - * parent affords them, so we know whatever this child claims - * and utilizes is effectively protected. - * - * If there is unprotected usage beyond this value, reclaim - * will apply pressure in proportion to that amount. - * - * If there is unutilized protection, the cgroup will be fully - * shielded from reclaim, but we do return a smaller value for - * protection than what the group could enjoy in theory. This - * is okay. With the overcommit distribution above, effective - * protection is always dependent on how memory is actually - * consumed among the siblings anyway. - */ - ep = protected; - - /* - * If the children aren't claiming (all of) the protection - * afforded to them by the parent, distribute the remainder in - * proportion to the (unprotected) memory of each cgroup. That - * way, cgroups that aren't explicitly prioritized wrt each - * other compete freely over the allowance, but they are - * collectively protected from neighboring trees. - * - * We're using unprotected memory for the weight so that if - * some cgroups DO claim explicit protection, we don't protect - * the same bytes twice. - * - * Check both usage and parent_usage against the respective - * protected values. One should imply the other, but they - * aren't read atomically - make sure the division is sane. - */ - if (!(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT)) - return ep; - if (parent_effective > siblings_protected && - parent_usage > siblings_protected && - usage > protected) { - unsigned long unclaimed; - - unclaimed = parent_effective - siblings_protected; - unclaimed *= usage - protected; - unclaimed /= parent_usage - siblings_protected; - - ep += unclaimed; - } - - return ep; -} - /** * mem_cgroup_calculate_protection - check if memory consumption is in the normal range * @root: the top ancestor of the sub-tree being checked @@ -7443,8 +7327,8 @@ static unsigned long effective_protection(unsigned long usage, void mem_cgroup_calculate_protection(struct mem_cgroup *root, struct mem_cgroup *memcg) { - unsigned long usage, parent_usage; - struct mem_cgroup *parent; + bool recursive_protection = + cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT; if (mem_cgroup_disabled()) return; @@ -7452,39 +7336,7 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, if (!root) root = root_mem_cgroup; - /* - * Effective values of the reclaim targets are ignored so they - * can be stale. Have a look at mem_cgroup_protection for more - * details. - * TODO: calculation should be more robust so that we do not need - * that special casing. - */ - if (memcg == root) - return; - - usage = page_counter_read(&memcg->memory); - if (!usage) - return; - - parent = parent_mem_cgroup(memcg); - - if (parent == root) { - memcg->memory.emin = READ_ONCE(memcg->memory.min); - memcg->memory.elow = READ_ONCE(memcg->memory.low); - return; - } - - parent_usage = page_counter_read(&parent->memory); - - WRITE_ONCE(memcg->memory.emin, effective_protection(usage, parent_usage, - READ_ONCE(memcg->memory.min), - READ_ONCE(parent->memory.emin), - atomic_long_read(&parent->memory.children_min_usage))); - - WRITE_ONCE(memcg->memory.elow, effective_protection(usage, parent_usage, - READ_ONCE(memcg->memory.low), - READ_ONCE(parent->memory.elow), - atomic_long_read(&parent->memory.children_low_usage))); + page_counter_calculate_protection(&root->memory, &memcg->memory, recursive_protection); } static int charge_memcg(struct folio *folio, struct mem_cgroup *memcg, diff --git a/mm/page_counter.c b/mm/page_counter.c index db20d6452b71..8ee49cbf71be 100644 --- a/mm/page_counter.c +++ b/mm/page_counter.c @@ -262,3 +262,176 @@ int page_counter_memparse(const char *buf, const char *max, return 0; } + + +/* + * This function calculates an individual page counter's effective + * protection which is derived from its own memory.min/low, its + * parent's and siblings' settings, as well as the actual memory + * distribution in the tree. + * + * The following rules apply to the effective protection values: + * + * 1. At the first level of reclaim, effective protection is equal to + * the declared protection in memory.min and memory.low. + * + * 2. To enable safe delegation of the protection configuration, at + * subsequent levels the effective protection is capped to the + * parent's effective protection. + * + * 3. To make complex and dynamic subtrees easier to configure, the + * user is allowed to overcommit the declared protection at a given + * level. If that is the case, the parent's effective protection is + * distributed to the children in proportion to how much protection + * they have declared and how much of it they are utilizing. + * + * This makes distribution proportional, but also work-conserving: + * if one counter claims much more protection than it uses memory, + * the unused remainder is available to its siblings. + * + * 4. Conversely, when the declared protection is undercommitted at a + * given level, the distribution of the larger parental protection + * budget is NOT proportional. A counter's protection from a sibling + * is capped to its own memory.min/low setting. + * + * 5. However, to allow protecting recursive subtrees from each other + * without having to declare each individual counter's fixed share + * of the ancestor's claim to protection, any unutilized - + * "floating" - protection from up the tree is distributed in + * proportion to each counter's *usage*. This makes the protection + * neutral wrt sibling cgroups and lets them compete freely over + * the shared parental protection budget, but it protects the + * subtree as a whole from neighboring subtrees. + * + * Note that 4. and 5. are not in conflict: 4. is about protecting + * against immediate siblings whereas 5. is about protecting against + * neighboring subtrees. + */ +static unsigned long effective_protection(unsigned long usage, + unsigned long parent_usage, + unsigned long setting, + unsigned long parent_effective, + unsigned long siblings_protected, + bool recursive_protection) +{ + unsigned long protected; + unsigned long ep; + + protected = min(usage, setting); + /* + * If all cgroups at this level combined claim and use more + * protection than what the parent affords them, distribute + * shares in proportion to utilization. + * + * We are using actual utilization rather than the statically + * claimed protection in order to be work-conserving: claimed + * but unused protection is available to siblings that would + * otherwise get a smaller chunk than what they claimed. + */ + if (siblings_protected > parent_effective) + return protected * parent_effective / siblings_protected; + + /* + * Ok, utilized protection of all children is within what the + * parent affords them, so we know whatever this child claims + * and utilizes is effectively protected. + * + * If there is unprotected usage beyond this value, reclaim + * will apply pressure in proportion to that amount. + * + * If there is unutilized protection, the cgroup will be fully + * shielded from reclaim, but we do return a smaller value for + * protection than what the group could enjoy in theory. This + * is okay. With the overcommit distribution above, effective + * protection is always dependent on how memory is actually + * consumed among the siblings anyway. + */ + ep = protected; + + /* + * If the children aren't claiming (all of) the protection + * afforded to them by the parent, distribute the remainder in + * proportion to the (unprotected) memory of each cgroup. That + * way, cgroups that aren't explicitly prioritized wrt each + * other compete freely over the allowance, but they are + * collectively protected from neighboring trees. + * + * We're using unprotected memory for the weight so that if + * some cgroups DO claim explicit protection, we don't protect + * the same bytes twice. + * + * Check both usage and parent_usage against the respective + * protected values. One should imply the other, but they + * aren't read atomically - make sure the division is sane. + */ + if (!recursive_protection) + return ep; + + if (parent_effective > siblings_protected && + parent_usage > siblings_protected && + usage > protected) { + unsigned long unclaimed; + + unclaimed = parent_effective - siblings_protected; + unclaimed *= usage - protected; + unclaimed /= parent_usage - siblings_protected; + + ep += unclaimed; + } + + return ep; +} + + +/** + * page_counter_calculate_protection - check if memory consumption is in the normal range + * @root: the top ancestor of the sub-tree being checked + * @memcg: the memory cgroup to check + * @recursive_protection: Whether to use memory_recursiveprot behavior. + * + * Calculates elow/emin thresholds for given page_counter. + * + * WARNING: This function is not stateless! It can only be used as part + * of a top-down tree iteration, not for isolated queries. + */ +void page_counter_calculate_protection(struct page_counter *root, + struct page_counter *counter, + bool recursive_protection) +{ + unsigned long usage, parent_usage; + struct page_counter *parent = counter->parent; + + /* + * Effective values of the reclaim targets are ignored so they + * can be stale. Have a look at mem_cgroup_protection for more + * details. + * TODO: calculation should be more robust so that we do not need + * that special casing. + */ + if (root == counter) + return; + + usage = page_counter_read(counter); + if (!usage) + return; + + if (parent == root) { + counter->emin = READ_ONCE(counter->min); + counter->elow = READ_ONCE(counter->low); + return; + } + + parent_usage = page_counter_read(parent); + + WRITE_ONCE(counter->emin, effective_protection(usage, parent_usage, + READ_ONCE(counter->min), + READ_ONCE(parent->emin), + atomic_long_read(&parent->children_min_usage), + recursive_protection)); + + WRITE_ONCE(counter->elow, effective_protection(usage, parent_usage, + READ_ONCE(counter->low), + READ_ONCE(parent->elow), + atomic_long_read(&parent->children_low_usage), + recursive_protection)); +} -- 2.45.2 . From: Stefan Eichenberger To: gregkh@linuxfoundation.org, jirislaby@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, cniedermaier@dh-electronics.com, stefan.eichenberger@toradex.com, l.sanfilippo@kunbus.com, tglx@linutronix.de, rickaran@axis.com, francesco.dolcini@toradex.com Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1] serial: imx: only set receiver level if it is zero Date: Wed, 3 Jul 2024 13:25:40 +0200 Message-ID: <20240703112543.148304-1-eichest@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266468 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-serial Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Stefan Eichenberger With commit a81dbd0463ec ("serial: imx: set receiver level before starting uart") we set the receiver level to its default value. This caused a regression when using SDMA, where the receiver level is 9 instead of 8 (default). This change will first check if the receiver level is zero and only then set it to the default. This still avoids the interrupt storm when the receiver level is zero. Fixes: a81dbd0463ec ("serial: imx: set receiver level before starting uart") Signed-off-by: Stefan Eichenberger --- drivers/tty/serial/imx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index f4f40c9373c2f..e22be8f45c93e 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -120,6 +120,7 @@ #define UCR4_OREN (1<<1) /* Receiver overrun interrupt enable */ #define UCR4_DREN (1<<0) /* Recv data ready interrupt enable */ #define UFCR_RXTL_SHF 0 /* Receiver trigger level shift */ +#define UFCR_RXTL_MASK 0x3F /* Receiver trigger 6 bits wide */ #define UFCR_DCEDTE (1<<6) /* DCE/DTE mode select */ #define UFCR_RFDIV (7<<7) /* Reference freq divider mask */ #define UFCR_RFDIV_REG(x) (((x) < 7 ? 6 - (x) : 6) << 7) @@ -1933,7 +1934,7 @@ static int imx_uart_rs485_config(struct uart_port *port, struct ktermios *termio struct serial_rs485 *rs485conf) { struct imx_port *sport = (struct imx_port *)port; - u32 ucr2; + u32 ucr2, ufcr; if (rs485conf->flags & SER_RS485_ENABLED) { /* Enable receiver if low-active RTS signal is requested */ @@ -1953,7 +1954,10 @@ static int imx_uart_rs485_config(struct uart_port *port, struct ktermios *termio /* Make sure Rx is enabled in case Tx is active with Rx disabled */ if (!(rs485conf->flags & SER_RS485_ENABLED) || rs485conf->flags & SER_RS485_RX_DURING_TX) { - imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); + /* If the receiver trigger is 0, set it to a default value */ + ufcr = imx_uart_readl(sport, UFCR); + if ((ufcr & UFCR_RXTL_MASK) == 0) + imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); imx_uart_start_rx(port); } -- 2.43.0 . From: Sungwoo Kim To: Cc: daveti@purdue.edu, benquike@gmail.com, Sungwoo Kim , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Bluetooth: hci: fix null-ptr-deref in hci_read_supported_codecs Date: Wed, 3 Jul 2024 07:39:37 -0400 Message-Id: <20240703113936.228226-1-iam@sung-woo.kim> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266482 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-bluetooth Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail KASAN: null-ptr-deref in range [0x0000000000000070-0x0000000000000077] CPU: 1 PID: 2000 Comm: kworker/u9:5 Not tainted 6.9.0-ga6bcb805883c-dirty #10 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Workqueue: hci7 hci_power_on RIP: 0010:hci_read_supported_codecs+0xb9/0x870 net/bluetooth/hci_codec.c:138 Code: 08 48 89 ef e8 b8 c1 8f fd 48 8b 75 00 e9 96 00 00 00 49 89 c6 48 ba 00 00 00 00 00 fc ff df 4c 8d 60 70 4c 89 e3 48 c1 eb 03 <0f> b6 04 13 84 c0 0f 85 82 06 00 00 41 83 3c 24 02 77 0a e8 bf 78 RSP: 0018:ffff888120bafac8 EFLAGS: 00010212 RAX: 0000000000000000 RBX: 000000000000000e RCX: ffff8881173f0040 RDX: dffffc0000000000 RSI: ffffffffa58496c0 RDI: ffff88810b9ad1e4 RBP: ffff88810b9ac000 R08: ffffffffa77882a7 R09: 1ffffffff4ef1054 R10: dffffc0000000000 R11: fffffbfff4ef1055 R12: 0000000000000070 R13: 0000000000000000 R14: 0000000000000000 R15: ffff88810b9ac000 FS: 0000000000000000(0000) GS:ffff8881f6c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6ddaa3439e CR3: 0000000139764003 CR4: 0000000000770ef0 PKRU: 55555554 Call Trace: hci_read_local_codecs_sync net/bluetooth/hci_sync.c:4546 [inline] hci_init_stage_sync net/bluetooth/hci_sync.c:3441 [inline] hci_init4_sync net/bluetooth/hci_sync.c:4706 [inline] hci_init_sync net/bluetooth/hci_sync.c:4742 [inline] hci_dev_init_sync net/bluetooth/hci_sync.c:4912 [inline] hci_dev_open_sync+0x19a9/0x2d30 net/bluetooth/hci_sync.c:4994 hci_dev_do_open net/bluetooth/hci_core.c:483 [inline] hci_power_on+0x11e/0x560 net/bluetooth/hci_core.c:1015 process_one_work kernel/workqueue.c:3267 [inline] process_scheduled_works+0x8ef/0x14f0 kernel/workqueue.c:3348 worker_thread+0x91f/0xe50 kernel/workqueue.c:3429 kthread+0x2cb/0x360 kernel/kthread.c:388 ret_from_fork+0x4d/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 Fixes: 8961987f3f5f ("Bluetooth: Enumerate local supported codec and cache details") Fixes: 9ae664028a9e ("Bluetooth: Add support for Read Local Supported Codecs V2") Signed-off-by: Sungwoo Kim --- net/bluetooth/hci_codec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c index 3cc135bb1..5c98eec2c 100644 --- a/net/bluetooth/hci_codec.c +++ b/net/bluetooth/hci_codec.c @@ -74,6 +74,9 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport, skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(*cmd), cmd, 0, HCI_CMD_TIMEOUT, NULL); + + if (!skb) + skb = ERR_PTR(-EINVAL); if (IS_ERR(skb)) { bt_dev_err(hdev, "Failed to read codec capabilities (%ld)", PTR_ERR(skb)); @@ -129,6 +132,8 @@ void hci_read_supported_codecs(struct hci_dev *hdev) skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODECS, 0, NULL, 0, HCI_CMD_TIMEOUT, NULL); + if (!skb) + skb = ERR_PTR(-EINVAL); if (IS_ERR(skb)) { bt_dev_err(hdev, "Failed to read local supported codecs (%ld)", PTR_ERR(skb)); @@ -198,6 +203,8 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev) skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODECS_V2, 0, NULL, 0, HCI_CMD_TIMEOUT, NULL); + if (!skb) + skb = ERR_PTR(-EINVAL); if (IS_ERR(skb)) { bt_dev_err(hdev, "Failed to read local supported codecs (%ld)", PTR_ERR(skb)); -- 2.34.1 . From: Shun-yi Wang To: Bjorn Andersson , Mathieu Poirier CC: Matthias Brugger , AngeloGioacchino Del Regno , , , , , , , , , , shun-yi.wang Subject: [PATCH 0/1] Support multiple reserved memory regions Date: Wed, 3 Jul 2024 19:53:07 +0800 Message-ID: <20240703115308.17436-1-shun-yi.wang@mediatek.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266488 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-remoteproc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: "shun-yi.wang" Besides the reserved memory region for SCP, there are additional reserved memory regions for specific hardware use. Currently, only a single memory region is supported. Modifications are made to support multiple memory regions. shun-yi.wang (1): remoteproc: mediatek: support multiple reserved memory drivers/remoteproc/mtk_scp.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) -- 2.18.0 . From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org Cc: Juergen Gross , Jonathan Corbet , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org Subject: [PATCH] xen: make multicall debug boot time selectable Date: Wed, 3 Jul 2024 13:56:20 +0200 Message-Id: <20240703115620.25772-1-jgross@suse.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266491 org.xenproject.lists.xen-devel:51522 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-doc,org.xenproject.lists.xen-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Today Xen multicall debugging needs to be enabled via modifying a define in a source file for getting debug data of multicall errors encountered by users. Switch multicall debugging to depend on a boot parameter "xen_mc_debug" instead, enabling affected users to boot with the new parameter set in order to get better diagnostics. Add printing all arguments of a single call for better diagnostics. Signed-off-by: Juergen Gross --- .../admin-guide/kernel-parameters.txt | 6 + arch/x86/xen/multicalls.c | 120 ++++++++++++++---- 2 files changed, 99 insertions(+), 27 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 27ec49af1bf2..b33d048e01d8 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -7427,6 +7427,12 @@ Crash from Xen panic notifier, without executing late panic() code such as dumping handler. + xen_mc_debug [X86,XEN,EARLY] + Enable multicall debugging when running as a Xen PV guest. + Enabling this feature will reduce performance a little + bit, so it should only be enabled for obtaining extended + debug data in case of multicall errors. + xen_msr_safe= [X86,XEN,EARLY] Format: Select whether to always use non-faulting (safe) MSR diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c index 07054572297f..abea216f07f4 100644 --- a/arch/x86/xen/multicalls.c +++ b/arch/x86/xen/multicalls.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include @@ -31,18 +33,12 @@ #define MC_BATCH 32 -#define MC_DEBUG 0 - #define MC_ARGS (MC_BATCH * 16) struct mc_buffer { unsigned mcidx, argidx, cbidx; struct multicall_entry entries[MC_BATCH]; -#if MC_DEBUG - struct multicall_entry debug[MC_BATCH]; - void *caller[MC_BATCH]; -#endif unsigned char args[MC_ARGS]; struct callback { void (*fn)(void *); @@ -50,13 +46,84 @@ struct mc_buffer { } callbacks[MC_BATCH]; }; +struct mc_debug_data { + struct multicall_entry debug[MC_BATCH]; + void *caller[MC_BATCH]; + size_t argsz[MC_BATCH]; +}; + static DEFINE_PER_CPU(struct mc_buffer, mc_buffer); +static struct mc_debug_data __percpu *mc_debug_data; +static struct mc_debug_data mc_debug_data_early __initdata; DEFINE_PER_CPU(unsigned long, xen_mc_irq_flags); +static struct static_key mc_debug __ro_after_init; +static bool mc_debug_enabled __initdata; + +static int __init xen_parse_mc_debug(char *arg) +{ + mc_debug_enabled = true; + static_key_slow_inc(&mc_debug); + + return 0; +} +early_param("xen_mc_debug", xen_parse_mc_debug); + +static int __init mc_debug_enable(void) +{ + struct mc_debug_data __percpu *mcdb; + unsigned long flags; + + if (!mc_debug_enabled) + return 0; + + mcdb = alloc_percpu(struct mc_debug_data); + if (!mcdb) { + pr_err("xen_mc_debug inactive\n"); + static_key_slow_dec(&mc_debug); + return -ENOMEM; + } + + /* Be careful when switching to percpu debug data. */ + local_irq_save(flags); + xen_mc_flush(); + mc_debug_data = mcdb; + local_irq_restore(flags); + + pr_info("xen_mc_debug active\n"); + + return 0; +} +early_initcall(mc_debug_enable); + +static void print_debug_data(struct mc_buffer *b, struct mc_debug_data *mcdb, + int idx) +{ + unsigned int arg; + + pr_err(" call %2d: op=%lu result=%ld caller=%pS", idx + 1, + mcdb->debug[idx].op, b->entries[idx].result, mcdb->caller[idx]); + if (mcdb->argsz[idx]) { + pr_cont(" args="); + for (arg = 0; arg < mcdb->argsz[idx] / 8; arg++) + pr_cont("%lx ", mcdb->debug[idx].args[arg]); + } + pr_cont("\n"); +} + +static struct mc_debug_data * __ref get_mc_debug_ptr(void) +{ + if (likely(mc_debug_data)) + return this_cpu_ptr(mc_debug_data); + + return &mc_debug_data_early; +} + void xen_mc_flush(void) { struct mc_buffer *b = this_cpu_ptr(&mc_buffer); struct multicall_entry *mc; + struct mc_debug_data *mcdb = NULL; int ret = 0; unsigned long flags; int i; @@ -69,10 +136,11 @@ void xen_mc_flush(void) trace_xen_mc_flush(b->mcidx, b->argidx, b->cbidx); -#if MC_DEBUG - memcpy(b->debug, b->entries, - b->mcidx * sizeof(struct multicall_entry)); -#endif + if (static_key_false(&mc_debug)) { + mcdb = get_mc_debug_ptr(); + memcpy(mcdb->debug, b->entries, + b->mcidx * sizeof(struct multicall_entry)); + } switch (b->mcidx) { case 0: @@ -104,20 +172,15 @@ void xen_mc_flush(void) ret, b->mcidx, smp_processor_id()); for (i = 0; i < b->mcidx; i++) { if (b->entries[i].result < 0) { -#if MC_DEBUG - pr_err(" call %2d: op=%lu arg=[%lx] result=%ld\t%pS\n", - i + 1, - b->debug[i].op, - b->debug[i].args[0], - b->entries[i].result, - b->caller[i]); -#else - pr_err(" call %2d: op=%lu arg=[%lx] result=%ld\n", - i + 1, - b->entries[i].op, - b->entries[i].args[0], - b->entries[i].result); -#endif + if (static_key_false(&mc_debug)) { + print_debug_data(b, mcdb, i); + } else { + pr_err(" call %2d: op=%lu arg=[%lx] result=%ld\n", + i + 1, + b->entries[i].op, + b->entries[i].args[0], + b->entries[i].result); + } } } } @@ -155,9 +218,12 @@ struct multicall_space __xen_mc_entry(size_t args) } ret.mc = &b->entries[b->mcidx]; -#if MC_DEBUG - b->caller[b->mcidx] = __builtin_return_address(0); -#endif + if (static_key_false(&mc_debug)) { + struct mc_debug_data *mcdb = get_mc_debug_ptr(); + + mcdb->caller[b->mcidx] = __builtin_return_address(0); + mcdb->argsz[b->mcidx] = args; + } b->mcidx++; ret.args = &b->args[argidx]; b->argidx = argidx + args; -- 2.35.3 . From: Lorenzo Stoakes To: Andrew Morton Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Liam R . Howlett" , Vlastimil Babka , Matthew Wilcox , Alexander Viro , Christian Brauner , Jan Kara , Eric Biederman , Kees Cook , Suren Baghdasaryan Subject: [PATCH 0/7] Make core VMA operations internal and testable Date: Wed, 3 Jul 2024 12:57:31 +0100 Message-ID: Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266494 org.kvack.linux-mm:202355 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail There are a number of "core" VMA manipulation functions implemented in mm/mmap.c, notably those concerning VMA merging, splitting, modifying, expanding and shrinking, which logically don't belong there. More importantly this functionality represents an internal implementation detail of memory management and should not be exposed outside of mm/ itself. This patch series isolates core VMA manipulation functionality into its own file, mm/vma.c, and provides an API to the rest of the mm code in mm/vma.h. Importantly, it also carefully implements mm/vma_internal.h, which specifies which headers need to be imported by vma.c, leading to the very useful property that vma.c depends only on mm/vma.h and mm/vma_internal.h. This means we can then re-implement vma_internal.h in userland, adding shims for kernel mechanisms as required, allowing us to unit test internal VMA functionality. This testing is useful as opposed to an e.g. kunit implementation as this way we can avoid all external kernel side-effects while testing, run tests VERY quickly, and iterate on and debug problems quickly. Excitingly this opens the door to, in the future, recreating precise problems observed in production in userland and very quickly debugging problems that might otherwise be very difficult to reproduce. This patch series takes advantage of existing shim logic and full userland maple tree support contained in tools/testing/radix-tree/ and tools/include/linux/, separating out shared components of the radix tree implementation to provide this testing. Kernel functionality is stubbed and shimmed as needed in tools/testing/vma/ which contains a fully functional userland vma_internal.h file and which imports mm/vma.c and mm/vma.h to be directly tested from userland. A simple, skeleton testing implementation is provided in tools/testing/vma/vma.c as a proof-of-concept, asserting that simple VMA merge, modify (testing split), expand and shrink functionality work correctly. v1: * Fix test_simple_modify() to specify correct prev. * Improve vma test Makefile so it picks up dependency changes correctly. * Rename relocate_vma() to relocate_vma_down(). * Remove shift_arg_pages() and invoked relocate_vma_down() directly from setup_arg_pages(). * MAINTAINERS fixups. RFC v2: * Reword commit messages. * Replace vma_expand() / vma_shrink() wrappers with relocate_vma(). * Make move_page_tables() internal too. * Have internal.h import vma.h. * Use header guards to more cleanly implement userland testing code. * Rename main.c to vma.c. * Update mm/vma_internal.h to have fewer superfluous comments. * Rework testing logic so we count test failures, and output test results. * Correct some SPDX license prefixes. * Make VM_xxx_ON() debug asserts forward to xxx_ON() macros. * Update VMA tests to correctly free memory, and re-enable ASAN leak detection. https://lore.kernel.org/all/cover.1719584707.git.lstoakes@gmail.com/ RFC v1: https://lore.kernel.org/all/cover.1719481836.git.lstoakes@gmail.com/ Lorenzo Stoakes (7): userfaultfd: move core VMA manipulation logic to mm/userfaultfd.c mm: move vma_modify() and helpers to internal header mm: move vma_shrink(), vma_expand() to internal header mm: move internal core VMA manipulation functions to own file MAINTAINERS: Add entry for new VMA files tools: separate out shared radix-tree components tools: add skeleton code for userland testing of VMA logic MAINTAINERS | 14 + fs/exec.c | 81 +- fs/userfaultfd.c | 160 +- include/linux/atomic.h | 2 +- include/linux/mm.h | 112 +- include/linux/mmzone.h | 3 +- include/linux/userfaultfd_k.h | 19 + mm/Makefile | 2 +- mm/internal.h | 167 +- mm/mmap.c | 2069 ++--------------- mm/mmu_notifier.c | 2 + mm/userfaultfd.c | 168 ++ mm/vma.c | 1766 ++++++++++++++ mm/vma.h | 362 +++ mm/vma_internal.h | 52 + tools/testing/radix-tree/Makefile | 68 +- tools/testing/radix-tree/maple.c | 14 +- tools/testing/radix-tree/xarray.c | 9 +- tools/testing/shared/autoconf.h | 2 + tools/testing/{radix-tree => shared}/bitmap.c | 0 tools/testing/{radix-tree => shared}/linux.c | 0 .../{radix-tree => shared}/linux/bug.h | 0 .../{radix-tree => shared}/linux/cpu.h | 0 .../{radix-tree => shared}/linux/idr.h | 0 .../{radix-tree => shared}/linux/init.h | 0 .../{radix-tree => shared}/linux/kconfig.h | 0 .../{radix-tree => shared}/linux/kernel.h | 0 .../{radix-tree => shared}/linux/kmemleak.h | 0 .../{radix-tree => shared}/linux/local_lock.h | 0 .../{radix-tree => shared}/linux/lockdep.h | 0 .../{radix-tree => shared}/linux/maple_tree.h | 0 .../{radix-tree => shared}/linux/percpu.h | 0 .../{radix-tree => shared}/linux/preempt.h | 0 .../{radix-tree => shared}/linux/radix-tree.h | 0 .../{radix-tree => shared}/linux/rcupdate.h | 0 .../{radix-tree => shared}/linux/xarray.h | 0 tools/testing/shared/maple-shared.h | 9 + tools/testing/shared/maple-shim.c | 7 + tools/testing/shared/shared.h | 34 + tools/testing/shared/shared.mk | 68 + .../testing/shared/trace/events/maple_tree.h | 5 + tools/testing/shared/xarray-shared.c | 5 + tools/testing/shared/xarray-shared.h | 4 + tools/testing/vma/.gitignore | 6 + tools/testing/vma/Makefile | 16 + tools/testing/vma/errors.txt | 0 tools/testing/vma/generated/autoconf.h | 2 + tools/testing/vma/linux/atomic.h | 12 + tools/testing/vma/linux/mmzone.h | 38 + tools/testing/vma/vma.c | 207 ++ tools/testing/vma/vma_internal.h | 882 +++++++ 51 files changed, 3914 insertions(+), 2453 deletions(-) create mode 100644 mm/vma.c create mode 100644 mm/vma.h create mode 100644 mm/vma_internal.h create mode 100644 tools/testing/shared/autoconf.h rename tools/testing/{radix-tree => shared}/bitmap.c (100%) rename tools/testing/{radix-tree => shared}/linux.c (100%) rename tools/testing/{radix-tree => shared}/linux/bug.h (100%) rename tools/testing/{radix-tree => shared}/linux/cpu.h (100%) rename tools/testing/{radix-tree => shared}/linux/idr.h (100%) rename tools/testing/{radix-tree => shared}/linux/init.h (100%) rename tools/testing/{radix-tree => shared}/linux/kconfig.h (100%) rename tools/testing/{radix-tree => shared}/linux/kernel.h (100%) rename tools/testing/{radix-tree => shared}/linux/kmemleak.h (100%) rename tools/testing/{radix-tree => shared}/linux/local_lock.h (100%) rename tools/testing/{radix-tree => shared}/linux/lockdep.h (100%) rename tools/testing/{radix-tree => shared}/linux/maple_tree.h (100%) rename tools/testing/{radix-tree => shared}/linux/percpu.h (100%) rename tools/testing/{radix-tree => shared}/linux/preempt.h (100%) rename tools/testing/{radix-tree => shared}/linux/radix-tree.h (100%) rename tools/testing/{radix-tree => shared}/linux/rcupdate.h (100%) rename tools/testing/{radix-tree => shared}/linux/xarray.h (100%) create mode 100644 tools/testing/shared/maple-shared.h create mode 100644 tools/testing/shared/maple-shim.c create mode 100644 tools/testing/shared/shared.h create mode 100644 tools/testing/shared/shared.mk create mode 100644 tools/testing/shared/trace/events/maple_tree.h create mode 100644 tools/testing/shared/xarray-shared.c create mode 100644 tools/testing/shared/xarray-shared.h create mode 100644 tools/testing/vma/.gitignore create mode 100644 tools/testing/vma/Makefile create mode 100644 tools/testing/vma/errors.txt create mode 100644 tools/testing/vma/generated/autoconf.h create mode 100644 tools/testing/vma/linux/atomic.h create mode 100644 tools/testing/vma/linux/mmzone.h create mode 100644 tools/testing/vma/vma.c create mode 100644 tools/testing/vma/vma_internal.h -- 2.45.2 . Message-ID: <2dea6faf-53f6-461a-809b-ec572357ad07@xs4all.nl> Date: Wed, 3 Jul 2024 13:59:16 +0200 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Language: en-US, nl To: Linux Media Mailing List Cc: Maxime Coquelin , Alexandre Torgue , Sakari Ailus , Alain Volmat , Hugues Fruchet , Linux Stable , "linux-stm32@st-md-mailman.stormreply.com" , linux-arm-kernel@lists.infradead.org, Linux Kernel From: Hans Verkuil Subject: [PATCH] media: stm32: dcmipp: correct error handling in, dcmipp_create_subdevs Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266502 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-media,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Alain Volmat Correct error handling within the dcmipp_create_subdevs by properly decrementing the i counter when releasing the subdevs. Fixes: 28e0f3772296 ("media: stm32-dcmipp: STM32 DCMIPP camera interface driver") Cc: stable@vger.kernel.org Signed-off-by: Alain Volmat Signed-off-by: Hans Verkuil [hverkuil: correct the indices: it's [i], not [i - 1].] --- The original patch would cause a crash due to the incorrect indices in the statement after the while. Since 'i' can now become 0, so i - 1 would be a negative index access, which was obviously not the intention. I reverted the patch once I noticed this (better to hang in an infinite loop than to crash), but I want to get a proper fix in. Rather than waiting for that, I decided to just take the original patch from Alain, with just the indices fixed. --- drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c index 4acc3b90d03a..7f771ea49b78 100644 --- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c +++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c @@ -202,8 +202,8 @@ static int dcmipp_create_subdevs(struct dcmipp_device *dcmipp) return 0; err_init_entity: - while (i > 0) - dcmipp->pipe_cfg->ents[i - 1].release(dcmipp->entity[i - 1]); + while (i-- > 0) + dcmipp->pipe_cfg->ents[i].release(dcmipp->entity[i]); return ret; } -- 2.43.0 . From: Gao Xiang To: linux-erofs@lists.ozlabs.org Cc: LKML , Gao Xiang Subject: [PATCH 1/4] erofs: convert z_erofs_pcluster_readmore() to folios Date: Wed, 3 Jul 2024 20:00:48 +0800 Message-ID: <20240703120051.3653452-1-hsiangkao@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266504 Newsgroups: org.kernel.vger.linux-kernel,org.ozlabs.lists.linux-erofs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Unlike `pagecache_get_page()`, `__filemap_get_folio()` returns error pointers instead of NULL, thus switching to `IS_ERR_OR_NULL`. Apart from that, it's just a straightforward conversion. Signed-off-by: Gao Xiang --- fs/erofs/internal.h | 14 +++++--------- fs/erofs/zdata.c | 15 +++++++-------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 0c1b44ac9524..9a72fcbc0b30 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -312,17 +312,13 @@ static inline unsigned int erofs_inode_datalayout(unsigned int ifmt) return (ifmt >> EROFS_I_DATALAYOUT_BIT) & EROFS_I_DATALAYOUT_MASK; } -/* - * Different from grab_cache_page_nowait(), reclaiming is never triggered - * when allocating new pages. - */ -static inline -struct page *erofs_grab_cache_page_nowait(struct address_space *mapping, - pgoff_t index) +/* reclaiming is never triggered when allocating new folios. */ +static inline struct folio *erofs_grab_folio_nowait(struct address_space *as, + pgoff_t index) { - return pagecache_get_page(mapping, index, + return __filemap_get_folio(as, index, FGP_LOCK|FGP_CREAT|FGP_NOFS|FGP_NOWAIT, - readahead_gfp_mask(mapping) & ~__GFP_RECLAIM); + readahead_gfp_mask(as) & ~__GFP_RECLAIM); } /* Has a disk mapping */ diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index d6fe002a4a71..14cf96fcefe4 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1767,7 +1767,6 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f, end = round_up(end, PAGE_SIZE); } else { end = round_up(map->m_la, PAGE_SIZE); - if (!map->m_llen) return; } @@ -1775,15 +1774,15 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f, cur = map->m_la + map->m_llen - 1; while ((cur >= end) && (cur < i_size_read(inode))) { pgoff_t index = cur >> PAGE_SHIFT; - struct page *page; + struct folio *folio; - page = erofs_grab_cache_page_nowait(inode->i_mapping, index); - if (page) { - if (PageUptodate(page)) - unlock_page(page); + folio = erofs_grab_folio_nowait(inode->i_mapping, index); + if (!IS_ERR_OR_NULL(folio)) { + if (folio_test_uptodate(folio)) + folio_unlock(folio); else - z_erofs_scan_folio(f, page_folio(page), !!rac); - put_page(page); + z_erofs_scan_folio(f, folio, !!rac); + folio_put(folio); } if (cur < PAGE_SIZE) -- 2.43.5 . Date: Wed, 3 Jul 2024 14:02:46 +0200 From: Stanislav Jakubek To: Daniel Lezcano , Thomas Gleixner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Orson Zhai , Baolin Wang , Baolin Wang , Chunyan Zhang Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH] dt-bindings: timer: sprd-timer: convert to YAML Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266507 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Convert the Spreadtrum SC9860 timer bindings to DT schema. Changes during conversion: - rename file to match compatible - add sprd,sc9860-suspend-timer which was previously undocumented - minor grammar fix in description Signed-off-by: Stanislav Jakubek --- .../bindings/timer/sprd,sc9860-timer.yaml | 68 +++++++++++++++++++ .../bindings/timer/spreadtrum,sprd-timer.txt | 20 ------ 2 files changed, 68 insertions(+), 20 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/sprd,sc9860-timer.yaml delete mode 100644 Documentation/devicetree/bindings/timer/spreadtrum,sprd-timer.txt diff --git a/Documentation/devicetree/bindings/timer/sprd,sc9860-timer.yaml b/Documentation/devicetree/bindings/timer/sprd,sc9860-timer.yaml new file mode 100644 index 000000000000..62c6da8bab5a --- /dev/null +++ b/Documentation/devicetree/bindings/timer/sprd,sc9860-timer.yaml @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/timer/sprd,sc9860-timer.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Spreadtrum SC9860 timer + +maintainers: + - Orson Zhai + - Baolin Wang + - Chunyan Zhang + +description: + The Spreadtrum SC9860 platform provides 3 general-purpose timers. + These timers can support 32bit or 64bit counter, as well as supporting + period mode or one-shot mode, and they can be a wakeup source + during deep sleep. + +properties: + compatible: + enum: + - sprd,sc9860-timer + - sprd,sc9860-suspend-timer + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + +required: + - compatible + - reg + - clocks + +allOf: + - if: + properties: + compatible: + contains: + const: sprd,sc9860-timer + then: + required: + - interrupts + +additionalProperties: false + +examples: + - | + #include + #include + + soc { + #address-cells = <2>; + #size-cells = <2>; + + timer@40050000 { + compatible = "sprd,sc9860-timer"; + reg = <0 0x40050000 0 0x20>; + interrupts = ; + clocks = <&ext_32k>; + }; + }; +... diff --git a/Documentation/devicetree/bindings/timer/spreadtrum,sprd-timer.txt b/Documentation/devicetree/bindings/timer/spreadtrum,sprd-timer.txt deleted file mode 100644 index 6d97e7d0f6e8..000000000000 --- a/Documentation/devicetree/bindings/timer/spreadtrum,sprd-timer.txt +++ /dev/null @@ -1,20 +0,0 @@ -Spreadtrum timers - -The Spreadtrum SC9860 platform provides 3 general-purpose timers. -These timers can support 32bit or 64bit counter, as well as supporting -period mode or one-shot mode, and they are can be wakeup source -during deep sleep. - -Required properties: -- compatible: should be "sprd,sc9860-timer" for SC9860 platform. -- reg: The register address of the timer device. -- interrupts: Should contain the interrupt for the timer device. -- clocks: The phandle to the source clock (usually a 32.768 KHz fixed clock). - -Example: - timer@40050000 { - compatible = "sprd,sc9860-timer"; - reg = <0 0x40050000 0 0x20>; - interrupts = ; - clocks = <&ext_32k>; - }; -- 2.34.1 . From: yangge1116@126.com To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, 21cnbao@gmail.com, david@redhat.com, baolin.wang@linux.alibaba.com, aneesh.kumar@linux.ibm.com, liuzixing@hygon.cn, yangge Subject: [PATCH V3] mm/gup: Clear the LRU flag of a page before adding to LRU batch Date: Wed, 3 Jul 2024 20:02:33 +0800 Message-Id: <1720008153-16035-1-git-send-email-yangge1116@126.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266509 org.kvack.linux-mm:202364 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.stable,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: yangge If a large number of CMA memory are configured in system (for example, the CMA memory accounts for 50% of the system memory), starting a virtual virtual machine with device passthrough, it will call pin_user_pages_remote(..., FOLL_LONGTERM, ...) to pin memory. Normally if a page is present and in CMA area, pin_user_pages_remote() will migrate the page from CMA area to non-CMA area because of FOLL_LONGTERM flag. But the current code will cause the migration failure due to unexpected page refcounts, and eventually cause the virtual machine fail to start. If a page is added in LRU batch, its refcount increases one, remove the page from LRU batch decreases one. Page migration requires the page is not referenced by others except page mapping. Before migrating a page, we should try to drain the page from LRU batch in case the page is in it, however, folio_test_lru() is not sufficient to tell whether the page is in LRU batch or not, if the page is in LRU batch, the migration will fail. To solve the problem above, we modify the logic of adding to LRU batch. Before adding a page to LRU batch, we clear the LRU flag of the page so that we can check whether the page is in LRU batch by folio_test_lru(page). Seems making the LRU flag of the page invisible a long time is no problem, because a new page is allocated from buddy and added to the lru batch, its LRU flag is also not visible for a long time. Fixes: 9a4e9f3b2d73 ("mm: update get_user_pages_longterm to migrate pages allocated from CMA region") Cc: Signed-off-by: yangge --- mm/swap.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) V3: Add fixes tag V2: Adjust code and commit message according to David's comments diff --git a/mm/swap.c b/mm/swap.c index dc205bd..9caf6b0 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -211,10 +211,6 @@ static void folio_batch_move_lru(struct folio_batch *fbatch, move_fn_t move_fn) for (i = 0; i < folio_batch_count(fbatch); i++) { struct folio *folio = fbatch->folios[i]; - /* block memcg migration while the folio moves between lru */ - if (move_fn != lru_add_fn && !folio_test_clear_lru(folio)) - continue; - folio_lruvec_relock_irqsave(folio, &lruvec, &flags); move_fn(lruvec, folio); @@ -255,11 +251,16 @@ static void lru_move_tail_fn(struct lruvec *lruvec, struct folio *folio) void folio_rotate_reclaimable(struct folio *folio) { if (!folio_test_locked(folio) && !folio_test_dirty(folio) && - !folio_test_unevictable(folio) && folio_test_lru(folio)) { + !folio_test_unevictable(folio)) { struct folio_batch *fbatch; unsigned long flags; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock_irqsave(&lru_rotate.lock, flags); fbatch = this_cpu_ptr(&lru_rotate.fbatch); folio_batch_add_and_move(fbatch, folio, lru_move_tail_fn); @@ -352,11 +353,15 @@ static void folio_activate_drain(int cpu) void folio_activate(struct folio *folio) { - if (folio_test_lru(folio) && !folio_test_active(folio) && - !folio_test_unevictable(folio)) { + if (!folio_test_active(folio) && !folio_test_unevictable(folio)) { struct folio_batch *fbatch; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.activate); folio_batch_add_and_move(fbatch, folio, folio_activate_fn); @@ -700,6 +705,11 @@ void deactivate_file_folio(struct folio *folio) return; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate_file); folio_batch_add_and_move(fbatch, folio, lru_deactivate_file_fn); @@ -716,11 +726,16 @@ void deactivate_file_folio(struct folio *folio) */ void folio_deactivate(struct folio *folio) { - if (folio_test_lru(folio) && !folio_test_unevictable(folio) && - (folio_test_active(folio) || lru_gen_enabled())) { + if (!folio_test_unevictable(folio) && (folio_test_active(folio) || + lru_gen_enabled())) { struct folio_batch *fbatch; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate); folio_batch_add_and_move(fbatch, folio, lru_deactivate_fn); @@ -737,12 +752,16 @@ void folio_deactivate(struct folio *folio) */ void folio_mark_lazyfree(struct folio *folio) { - if (folio_test_lru(folio) && folio_test_anon(folio) && - folio_test_swapbacked(folio) && !folio_test_swapcache(folio) && - !folio_test_unevictable(folio)) { + if (folio_test_anon(folio) && folio_test_swapbacked(folio) && + !folio_test_swapcache(folio) && !folio_test_unevictable(folio)) { struct folio_batch *fbatch; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_lazyfree); folio_batch_add_and_move(fbatch, folio, lru_lazyfree_fn); -- 2.7.4 . From: Krzysztof Kozlowski Subject: [PATCH 00/11] ASoC: Simplify code with cleanup.h Date: Wed, 03 Jul 2024 14:10:54 +0200 Message-Id: <20240703-asoc-cleanup-h-v1-0-71219dfd0aef@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , Banajit Goswami Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, Krzysztof Kozlowski Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266513 Newsgroups: org.kernel.vger.linux-kernel,org.alsa-project.alsa-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Allocate the memory with scoped/cleanup.h to reduce error handling (simpler error paths) and make the code a bit smaller. Best regards, Krzysztof --- Krzysztof Kozlowski (11): ASoC: codecs: audio-iio-aux: Simplify audio_iio_aux_add_dapms() with cleanup.h ASoC: codecs: audio-iio-aux: Simplify audio_iio_aux_probe() with cleanup.h ASoC: codecs: wcd9335: Simplify with cleanup.h ASoC: codecs: wcd934x: Simplify with cleanup.h ASoC: simple-card-utils: Simplify with cleanup.h ASoC: audio-graph-card: Use cleanup.h instead of devm_kfree() ASoC: audio-graph-card2: Use cleanup.h instead of devm_kfree() ASoC: simple-card: Use cleanup.h instead of devm_kfree() ASoC: ops: Simplify with cleanup.h ASoC: dapm: Simplify dapm_cnew_widget() with cleanup.h ASoC: dapm: Simplify snd_soc_dai_link_event_pre_pmu() with cleanup.h sound/soc/codecs/audio-iio-aux.c | 83 ++++++++++++----------------------- sound/soc/codecs/wcd9335.c | 22 ++++------ sound/soc/codecs/wcd934x.c | 22 ++++------ sound/soc/generic/audio-graph-card.c | 5 +-- sound/soc/generic/audio-graph-card2.c | 5 +-- sound/soc/generic/simple-card-utils.c | 13 +++--- sound/soc/generic/simple-card.c | 5 +-- sound/soc/soc-dapm.c | 47 ++++++++------------ sound/soc/soc-ops.c | 26 +++++------ 9 files changed, 87 insertions(+), 141 deletions(-) --- base-commit: cf601827c51b0496f6bb8a1865f1bf69ebd246b7 change-id: 20240703-asoc-cleanup-h-ef9cbfb67b66 Best regards, -- Krzysztof Kozlowski . From: Mao Jinlong To: Suzuki K Poulose , Mike Leach , James Clark , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mao Jinlong , "Alexander Shishkin" CC: , , , , , Tingwei Zhang , Yuanfang Zhang , Tao Zhang , songchai , Jie Gan Subject: [PATCH v4 0/2] coresight: core: Add device name support Date: Wed, 3 Jul 2024 05:23:36 -0700 Message-ID: <20240703122340.26864-1-quic_jinlmao@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266535 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With current design, the name of the non-cpu bounded coresight component is the device type with the number. And with 'ls' command we can get the register address of the component. But from these information, we can't know what the HW or system the component belongs to. Add device-name in DT to support it. cti_sys0 -> ../../../devices/platform/soc@0/138f0000.cti/cti_sys0 cti_sys1 -> ../../../devices/platform/soc@0/13900000.cti/cti_sys1 tpdm0 -> ../../../devices/platform/soc@0/10b0d000.tpdm/tpdm0 tpdm1 -> ../../../devices/platform/soc@0/10c28000.tpdm/tpdm1 tpdm2 -> ../../../devices/platform/soc@0/10c29000.tpdm/tpdm2 Change since V3: 1. Change device-name to arm,cs-dev-name. 2. Add arm,cs-dev-name to only CTI and sources' dt-binding. Change since V2: 1. Fix the error in coresight core. drivers/hwtracing/coresight/coresight-core.c:1775:7: error: assigning to 'char *' from 'const char *' discards qualifiers 2. Fix the warning when run dtbinding check. Documentation/devicetree/bindings/arm/arm,coresight-cpu-debug.yaml: device-name: missing type definition Change since V1: 1. Change coresight-name to device name. 2. Add the device-name in coresight dt bindings. Mao Jinlong (2): coresight: core: Add device name support dt-bindings: arm: Add device-name in the coresight components .../bindings/arm/arm,coresight-catu.yaml | 6 +++ .../bindings/arm/arm,coresight-cpu-debug.yaml | 6 +++ .../bindings/arm/arm,coresight-cti.yaml | 6 +++ .../arm/arm,coresight-dummy-sink.yaml | 6 +++ .../arm/arm,coresight-dummy-source.yaml | 6 +++ .../arm/arm,coresight-dynamic-funnel.yaml | 6 +++ .../arm/arm,coresight-dynamic-replicator.yaml | 6 +++ .../bindings/arm/arm,coresight-etb10.yaml | 6 +++ .../bindings/arm/arm,coresight-etm.yaml | 6 +++ .../arm/arm,coresight-static-funnel.yaml | 6 +++ .../arm/arm,coresight-static-replicator.yaml | 6 +++ .../bindings/arm/arm,coresight-stm.yaml | 6 +++ .../bindings/arm/arm,coresight-tmc.yaml | 6 +++ .../bindings/arm/arm,coresight-tpiu.yaml | 6 +++ .../bindings/arm/qcom,coresight-tpda.yaml | 6 +++ .../bindings/arm/qcom,coresight-tpdm.yaml | 6 +++ drivers/hwtracing/coresight/coresight-core.c | 37 ++++++++++--------- .../hwtracing/coresight/coresight-platform.c | 31 ++++++++++++++++ include/linux/coresight.h | 3 +- 19 files changed, 149 insertions(+), 18 deletions(-) Mao Jinlong (2): dt-bindings: arm: Add device-name in the coresight components coresight: core: Add device name support .../bindings/arm/arm,coresight-cti.yaml | 6 +++ .../arm/arm,coresight-dummy-source.yaml | 6 +++ .../bindings/arm/arm,coresight-stm.yaml | 6 +++ .../bindings/arm/qcom,coresight-tpdm.yaml | 6 +++ drivers/hwtracing/coresight/coresight-core.c | 37 ++++++++++--------- .../hwtracing/coresight/coresight-platform.c | 30 +++++++++++++++ include/linux/coresight.h | 3 +- 7 files changed, 76 insertions(+), 18 deletions(-) -- 2.41.0 . Date: Wed, 3 Jul 2024 14:26:32 +0200 From: Stanislav Jakubek To: Bjorn Andersson , Baolin Wang , baolin.wang7@gmail.com, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Orson Zhai , Chunyan Zhang Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt-bindings: hwlock: sprd-hwspinlock: convert to YAML Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266538 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-remoteproc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Convert the Spreadtrum hardware spinlock bindings to DT schema. Signed-off-by: Stanislav Jakubek --- .../bindings/hwlock/sprd,hwspinlock-r3p0.yaml | 55 +++++++++++++++++++ .../bindings/hwlock/sprd-hwspinlock.txt | 23 -------- 2 files changed, 55 insertions(+), 23 deletions(-) create mode 100644 Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml delete mode 100644 Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt diff --git a/Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml b/Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml new file mode 100644 index 000000000000..b146b1c20edb --- /dev/null +++ b/Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml @@ -0,0 +1,55 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/hwlock/sprd,hwspinlock-r3p0.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Spreadtrum hardware spinlock + +maintainers: + - Orson Zhai + - Baolin Wang + - Chunyan Zhang + +properties: + compatible: + const: sprd,hwspinlock-r3p0 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + const: enable + + '#hwlock-cells': + const: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#hwlock-cells' + +additionalProperties: false + +examples: + - | + #include + + soc { + #address-cells = <2>; + #size-cells = <2>; + + hwlock@40500000 { + compatible = "sprd,hwspinlock-r3p0"; + reg = <0 0x40500000 0 0x1000>; + clocks = <&aon_gate CLK_SPLK_EB>; + clock-names = "enable"; + #hwlock-cells = <1>; + }; + }; +... diff --git a/Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt b/Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt deleted file mode 100644 index 581db9d941ba..000000000000 --- a/Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt +++ /dev/null @@ -1,23 +0,0 @@ -SPRD Hardware Spinlock Device Binding -------------------------------------- - -Required properties : -- compatible : should be "sprd,hwspinlock-r3p0". -- reg : the register address of hwspinlock. -- #hwlock-cells : hwlock users only use the hwlock id to represent a specific - hwlock, so the number of cells should be <1> here. -- clock-names : Must contain "enable". -- clocks : Must contain a phandle entry for the clock in clock-names, see the - common clock bindings. - -Please look at the generic hwlock binding for usage information for consumers, -"Documentation/devicetree/bindings/hwlock/hwlock.txt" - -Example of hwlock provider: - hwspinlock@40500000 { - compatible = "sprd,hwspinlock-r3p0"; - reg = <0 0x40500000 0 0x1000>; - #hwlock-cells = <1>; - clock-names = "enable"; - clocks = <&clk_aon_apb_gates0 22>; - }; -- 2.34.1 . From: Alexander Stein To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: Alexander Stein , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/1] drm/bridge: Silence error messages upon probe deferral Date: Wed, 3 Jul 2024 14:27:15 +0200 Message-Id: <20240703122715.4004765-1-alexander.stein@ew.tq-group.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266539 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail When -EPROBE_DEFER is returned do not raise an error, but silently return this error instead. Fixes error like this: [drm:drm_bridge_attach] *ERROR* failed to attach bridge /soc@0/bus@30800000/mipi-dsi@30a00000 to encoder None-34: -517 [drm:drm_bridge_attach] *ERROR* failed to attach bridge /soc@0/bus@30800000/mipi-dsi@30a00000 to encoder None-34: -517 Signed-off-by: Alexander Stein Reviewed-by: Robert Foss --- Changes in v5: * Added dev_err_probe() call if probe deferral occurs drivers/gpu/drm/drm_bridge.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index d44f055dbe3e7..c6af46dd02bfa 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -353,8 +353,13 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, bridge->encoder = NULL; list_del(&bridge->chain_node); - DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", - bridge->of_node, encoder->name, ret); + if (ret != -EPROBE_DEFER) + DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", + bridge->of_node, encoder->name, ret); + else + dev_err_probe(encoder->dev->dev, -EPROBE_DEFER, + "failed to attach bridge %pOF to encoder %s\n", + bridge->of_node, encoder->name); return ret; } -- 2.34.1 . From: Benjamin Hahn Date: Wed, 3 Jul 2024 14:35:38 +0200 Subject: [PATCH] arm64: dts: freescale: imx8mp-phycore: Add no-eth overlay X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20240703-bspimx8m-3180-v1-1-e43e035a9b2a@phytec.de> To: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: , , , , , Benjamin Hahn Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266548 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add a devicetree overlay to disable ethernet for boards where it is not populated. Signed-off-by: Benjamin Hahn --- arch/arm64/boot/dts/freescale/Makefile | 2 ++ .../boot/dts/freescale/imx8mp-phycore-no-eth.dtso | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 2cb0212b63c6..16e06e6f055c 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -164,6 +164,8 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-icore-mx8mp-edimm2.2.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-msc-sm2s-ep1.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk.dtb +imx8mp-phyboard-pollux-rdk-no-eth-dtbs += imx8mp-phyboard-pollux-rdk.dtb imx8mp-phycore-no-eth.dtbo +dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk-no-eth.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-skov-revb-hdmi.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-skov-revb-lt6.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-skov-revb-mi1010ait-1cp1.dtb diff --git a/arch/arm64/boot/dts/freescale/imx8mp-phycore-no-eth.dtso b/arch/arm64/boot/dts/freescale/imx8mp-phycore-no-eth.dtso new file mode 100644 index 000000000000..2a9fe1d6db9d --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx8mp-phycore-no-eth.dtso @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024 PHYTEC Messtechnik GmbH + * Author: Cem Tenruh + */ + +/dts-v1/; +/plugin/; + +&{/} { + compatible = "phytec,imx8mp-phycore-som"; +}; + +ðphy1 { + status = "disabled"; +}; + +&fec { + status = "disabled"; +}; --- base-commit: e8f897f4afef0031fe618a8e94127a0934896aba change-id: 20240617-bspimx8m-3180-47bed184a854 Best regards, -- Benjamin Hahn . From: Shengjiu Wang To: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, ckeepax@opensource.cirrus.com, andriy.shevchenko@linux.intel.com, heiko@sntech.de, robh@kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com Subject: [PATCH] ASoC: ak4458: remove "reset-gpios" property handler Date: Wed, 3 Jul 2024 20:26:15 +0800 Message-Id: <1720009575-11677-1-git-send-email-shengjiu.wang@nxp.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266563 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail commit c721f189e89c0 ("reset: Instantiate reset GPIO controller for shared reset-gpios") check if there is no "resets" property will fallback to "reset-gpios". So don't need to handle "reset-gpios" separately in the driver, the "reset-gpios" handler is duplicated with "resets" control handler, remove it. Signed-off-by: Shengjiu Wang --- sound/soc/codecs/ak4458.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c index 32cb802ad635..d472d9952628 100644 --- a/sound/soc/codecs/ak4458.c +++ b/sound/soc/codecs/ak4458.c @@ -45,7 +45,6 @@ struct ak4458_priv { const struct ak4458_drvdata *drvdata; struct device *dev; struct regmap *regmap; - struct gpio_desc *reset_gpiod; struct reset_control *reset; struct gpio_desc *mute_gpiod; int digfil; /* SSLOW, SD, SLOW bits */ @@ -631,10 +630,7 @@ static struct snd_soc_dai_driver ak4497_dai = { static void ak4458_reset(struct ak4458_priv *ak4458, bool active) { - if (ak4458->reset_gpiod) { - gpiod_set_value_cansleep(ak4458->reset_gpiod, active); - usleep_range(1000, 2000); - } else if (!IS_ERR_OR_NULL(ak4458->reset)) { + if (!IS_ERR_OR_NULL(ak4458->reset)) { if (active) reset_control_assert(ak4458->reset); else @@ -758,11 +754,6 @@ static int ak4458_i2c_probe(struct i2c_client *i2c) if (IS_ERR(ak4458->reset)) return PTR_ERR(ak4458->reset); - ak4458->reset_gpiod = devm_gpiod_get_optional(ak4458->dev, "reset", - GPIOD_OUT_LOW); - if (IS_ERR(ak4458->reset_gpiod)) - return PTR_ERR(ak4458->reset_gpiod); - ak4458->mute_gpiod = devm_gpiod_get_optional(ak4458->dev, "mute", GPIOD_OUT_LOW); if (IS_ERR(ak4458->mute_gpiod)) -- 2.34.1 . From: David Gstir To: Herbert Xu , "David S. Miller" , Shawn Guo , Sascha Hauer , Fabio Estevam , Jarkko Sakkinen , David Oberhollenzer , Richard Weinberger Cc: Pengutronix Kernel Team , linux-crypto@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, sigma star Kernel Team , David Gstir , kernel test robot , Dan Carpenter Subject: [PATCH] crypto: mxs-dcp: Ensure payload is zero when using key slot Date: Wed, 3 Jul 2024 14:49:58 +0200 Message-ID: <20240703124958.45898-1-david@sigma-star.at> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266569 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-crypto Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail We could leak stack memory through the payload field when running AES with a key from one of the hardware's key slots. Fix this by ensuring the payload field is set to 0 in such cases. This does not affect the common use case when the key is supplied from main memory via the descriptor payload. Signed-off-by: David Gstir Reported-by: kernel test robot Reported-by: Dan Carpenter Closes: https://lore.kernel.org/r/202405270146.Y9tPoil8-lkp@intel.com/ Fixes: 3d16af0b4cfa ("crypto: mxs-dcp: Add support for hardware-bound keys") --- drivers/crypto/mxs-dcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c index 057d73c370b7..c82775dbb557 100644 --- a/drivers/crypto/mxs-dcp.c +++ b/drivers/crypto/mxs-dcp.c @@ -225,7 +225,8 @@ static int mxs_dcp_start_dma(struct dcp_async_ctx *actx) static int mxs_dcp_run_aes(struct dcp_async_ctx *actx, struct skcipher_request *req, int init) { - dma_addr_t key_phys, src_phys, dst_phys; + dma_addr_t key_phys = 0; + dma_addr_t src_phys, dst_phys; struct dcp *sdcp = global_sdcp; struct dcp_dma_desc *desc = &sdcp->coh->desc[actx->chan]; struct dcp_aes_req_ctx *rctx = skcipher_request_ctx(req); -- 2.35.3 . Date: Wed, 3 Jul 2024 20:53:25 +0800 (CST) Message-ID: <202407032053257877vuVsFfB1hh0DKSowPd8p@zte.com.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 From: To: , , , , , , , , , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHQgdjJdIHNjaGVkL2NvcmU6IEFkZCBXQVJOKCkgdG8gY2hlY2sgb3ZlcmZsb3cgaW4gbWlncmF0ZV9kaXNhYmxlKCk=?= Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266574 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Peilin He Background ========== When repeated migrate_disable() calls are made with missing the corresponding migrate_enable() calls, there is a risk of 'migration_disabled' going upper overflow because 'migration_disabled' is a type of unsigned short whose max value is 65535. In PREEMPT_RT kernel, if 'migration_disabled' goes upper overflow, it may make the migrate_disable() ineffective within local_lock_irqsave(). This is because, during the scheduling procedure, the value of 'migration_disabled' will be checked, which can trigger CPU migration. Consequently, the count of 'rcu_read_lock_nesting' may leak due to local_lock_irqsave() and local_unlock_irqrestore() occurring on different CPUs. Usecase ======== For example, When I developed a driver, I encountered a warning like "WARNING: CPU: 4 PID: 260 at kernel/rcu/tree_plugin.h:315 rcu_note_context_switch+0xa8/0x4e8" warning. It took me half a month to locate this issue. Ultimately, I discovered that the lack of upper overflow detection mechanism in migrate_disable() was the root cause, leading to a significant amount of time spent on problem localization. If the upper overflow detection mechanism was added to migrate_disable(), the root cause could be very quickly and easily identified. Effect ====== Using WARN() to check if 'migration_disabled' is upper overflow can help developers identify the issue quickly. Signed-off-by: Peilin He Signed-off-by: xu xin Reviewed-by: Yunkai Zhang Reviewed-by: Qiang Tu Reviewed-by: Kun Jiang Reviewed-by: Fan Yu Cc: Yang Yang Cc: Liu Chun --- v1->v2: Some fixes according to: https://lore.kernel.org/all/20240702124334.762dbd5a@rorschach.local.home/ 1.Merge if conditions into WARN(). 2.Remove the newline character '\n'. Right, we don't need the redundant \n. kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8cc4975d6b2b..327010af6ce9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2259,6 +2259,7 @@ void migrate_disable(void) struct task_struct *p = current; if (p->migration_disabled) { + WARN(p->migration_disabled == USHRT_MAX, "migration_disabled has encountered an overflow."); p->migration_disabled++; return; } -- 2.17.1 . From: David Gstir To: sigma star Kernel Team , James Bottomley , Jarkko Sakkinen , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , David Oberhollenzer , Richard Weinberger Cc: linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, David Gstir , kernel test robot Subject: [PATCH 1/2] KEYS: trusted: fix DCP blob payload length assignment Date: Wed, 3 Jul 2024 14:53:52 +0200 Message-ID: <20240703125353.46115-1-david@sigma-star.at> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266575 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.keyrings,org.kernel.vger.linux-integrity,org.kernel.vger.linux-security-module Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The DCP trusted key type uses the wrong helper function to store the blob's payload length which can lead to the wrong byte order being used in case this would ever run on big endian architectures. Fix by using correct helper function. Signed-off-by: David Gstir Suggested-by: Richard Weinberger Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202405240610.fj53EK0q-lkp@intel.com/ Fixes: 2e8a0f40a39c ("KEYS: trusted: Introduce NXP DCP-backed trusted keys") --- security/keys/trusted-keys/trusted_dcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/keys/trusted-keys/trusted_dcp.c b/security/keys/trusted-keys/trusted_dcp.c index b5f81a05be36..b0947f072a98 100644 --- a/security/keys/trusted-keys/trusted_dcp.c +++ b/security/keys/trusted-keys/trusted_dcp.c @@ -222,7 +222,7 @@ static int trusted_dcp_seal(struct trusted_key_payload *p, char *datablob) return ret; } - b->payload_len = get_unaligned_le32(&p->key_len); + put_unaligned_le32(p->key_len, &b->payload_len); p->blob_len = blen; return 0; } -- 2.35.3 . Date: Wed, 3 Jul 2024 15:07:40 +0200 From: Johan Hovold To: Robert Foss , Todor Tomov , Bryan O'Donoghue Cc: Mauro Carvalho Chehab , Kieran Bingham , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Failure to stop CAMSS stream (sc8280xp) Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266586 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, I've been testing Bryan's work that enables the camera on the Lenovo ThinkPad X13s and keep triggering the below warnings when stopping a stream (e.g. closing qcam) which indicate that this is a driver bug. After this happens qcam fails to start again (something returns -EBUSY). Is this a known issue with CAMSS or is something missing in the sc8280xp integration? I'm using the following (squashed) devicetree patch from Bryan to enable the camera (everything else is upstream): https://github.com/jhovold/linux/commit/85b41b8d0efd418509df548592f95b43b9663409 The issue was there with 6.9 as well so it's not a (recent) regression. Probing the camera sometimes, but infrequently, also fails with: qcom-camss ac5a000.camss: Failed to power up pipeline: -13 and I'm seeing the following warning on every boot: i2c-qcom-cci ac4c000.cci: Found 19200000 cci clk rate while 37500000 was expected Johan [ 1265.509677] ------------[ cut here ]------------ [ 1265.509831] WARNING: CPU: 5 PID: 919 at drivers/media/common/videobuf2/videobuf2-core.c:2183 __vb2_queue_cancel+0x230/0x2c8 [videobuf2_common] ... [ 1265.510417] CPU: 5 PID: 919 Comm: qcam Not tainted 6.10.0-rc5 #124 [ 1265.510428] Hardware name: LENOVO 21BYZ9SRUS/21BYZ9SRUS, BIOS N3HET87W (1.59 ) 12/05/2023 ... [ 1265.510630] Call trace: [ 1265.510636] __vb2_queue_cancel+0x230/0x2c8 [videobuf2_common] [ 1265.510648] vb2_core_streamoff+0x24/0xcc [videobuf2_common] [ 1265.510660] vb2_ioctl_streamoff+0x5c/0xa8 [videobuf2_v4l2] [ 1265.510673] v4l_streamoff+0x24/0x30 [videodev] [ 1265.510707] __video_do_ioctl+0x190/0x3f4 [videodev] [ 1265.510732] video_usercopy+0x304/0x8c4 [videodev] [ 1265.510757] video_ioctl2+0x18/0x34 [videodev] [ 1265.510782] v4l2_ioctl+0x40/0x60 [videodev] [ 1265.510807] __arm64_sys_ioctl+0xa8/0xec [ 1265.510820] invoke_syscall+0x48/0x118 [ 1265.510834] el0_svc_common.constprop.0+0x40/0xe0 [ 1265.510845] do_el0_svc+0x1c/0x28 [ 1265.510856] el0_svc+0x48/0x114 [ 1265.510867] el0t_64_sync_handler+0xc0/0xc4 [ 1265.510876] el0t_64_sync+0x190/0x194 [ 1265.510885] irq event stamp: 279668 [ 1265.510892] hardirqs last enabled at (279667): [] _raw_spin_unlock_irqrestore+0x74/0x78 [ 1265.510904] hardirqs last disabled at (279668): [] el1_dbg+0x24/0x8c [ 1265.510913] softirqs last enabled at (279636): [] fpsimd_restore_current_state+0x34/0xc4 [ 1265.510924] softirqs last disabled at (279634): [] fpsimd_restore_current_state+0x4/0xc4 [ 1265.510935] ---[ end trace 0000000000000000 ]--- [ 1265.510944] videobuf2_common: driver bug: stop_streaming operation is leaving buffer 0 in active state [ 1265.511175] videobuf2_common: driver bug: stop_streaming operation is leaving buffer 1 in active state [ 1265.511398] videobuf2_common: driver bug: stop_streaming operation is leaving buffer 2 in active state . Date: Wed, 3 Jul 2024 15:32:04 +0200 From: Stanislav Jakubek To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Orson Zhai , Baolin Wang , Baolin Wang , Chunyan Zhang Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt-bindings: clock: sprd,sc9860-clk: convert to YAML Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266609 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Convert the Spreadtrum SC9860 clock bindings to DT schema. Signed-off-by: Stanislav Jakubek --- .../bindings/clock/sprd,sc9860-clk.txt | 63 ------------- .../bindings/clock/sprd,sc9860-clk.yaml | 90 +++++++++++++++++++ 2 files changed, 90 insertions(+), 63 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/sprd,sc9860-clk.txt create mode 100644 Documentation/devicetree/bindings/clock/sprd,sc9860-clk.yaml diff --git a/Documentation/devicetree/bindings/clock/sprd,sc9860-clk.txt b/Documentation/devicetree/bindings/clock/sprd,sc9860-clk.txt deleted file mode 100644 index aaaf02ca2a6a..000000000000 --- a/Documentation/devicetree/bindings/clock/sprd,sc9860-clk.txt +++ /dev/null @@ -1,63 +0,0 @@ -Spreadtrum SC9860 Clock Binding ------------------------- - -Required properties: -- compatible: should contain the following compatible strings: - - "sprd,sc9860-pmu-gate" - - "sprd,sc9860-pll" - - "sprd,sc9860-ap-clk" - - "sprd,sc9860-aon-prediv" - - "sprd,sc9860-apahb-gate" - - "sprd,sc9860-aon-gate" - - "sprd,sc9860-aonsecure-clk" - - "sprd,sc9860-agcp-gate" - - "sprd,sc9860-gpu-clk" - - "sprd,sc9860-vsp-clk" - - "sprd,sc9860-vsp-gate" - - "sprd,sc9860-cam-clk" - - "sprd,sc9860-cam-gate" - - "sprd,sc9860-disp-clk" - - "sprd,sc9860-disp-gate" - - "sprd,sc9860-apapb-gate" - -- #clock-cells: must be 1 - -- clocks : Should be the input parent clock(s) phandle for the clock, this - property here just simply shows which clock group the clocks' - parents are in, since each clk node would represent many clocks - which are defined in the driver. The detailed dependency - relationship (i.e. how many parents and which are the parents) - are implemented in driver code. - -Optional properties: - -- reg: Contain the registers base address and length. It must be configured - only if no 'sprd,syscon' under the node. - -- sprd,syscon: phandle to the syscon which is in the same address area with - the clock, and so we can get regmap for the clocks from the - syscon device. - -Example: - - pmu_gate: pmu-gate { - compatible = "sprd,sc9860-pmu-gate"; - sprd,syscon = <&pmu_regs>; - clocks = <&ext_26m>; - #clock-cells = <1>; - }; - - pll: pll { - compatible = "sprd,sc9860-pll"; - sprd,syscon = <&ana_regs>; - clocks = <&pmu_gate 0>; - #clock-cells = <1>; - }; - - ap_clk: clock-controller@20000000 { - compatible = "sprd,sc9860-ap-clk"; - reg = <0 0x20000000 0 0x400>; - clocks = <&ext_26m>, <&pll 0>, - <&pmu_gate 0>; - #clock-cells = <1>; - }; diff --git a/Documentation/devicetree/bindings/clock/sprd,sc9860-clk.yaml b/Documentation/devicetree/bindings/clock/sprd,sc9860-clk.yaml new file mode 100644 index 000000000000..21ed023a928c --- /dev/null +++ b/Documentation/devicetree/bindings/clock/sprd,sc9860-clk.yaml @@ -0,0 +1,90 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/sprd,sc9860-clk.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Spreadtrum SC9860 clock + +maintainers: + - Orson Zhai + - Baolin Wang + - Chunyan Zhang + +properties: + compatible: + enum: + - sprd,sc9860-agcp-gate + - sprd,sc9860-aonsecure-clk + - sprd,sc9860-aon-gate + - sprd,sc9860-aon-prediv + - sprd,sc9860-apahb-gate + - sprd,sc9860-apapb-gate + - sprd,sc9860-ap-clk + - sprd,sc9860-cam-clk + - sprd,sc9860-cam-gate + - sprd,sc9860-disp-clk + - sprd,sc9860-disp-gate + - sprd,sc9860-gpu-clk + - sprd,sc9860-pll + - sprd,sc9860-pmu-gate + - sprd,sc9860-vsp-clk + - sprd,sc9860-vsp-gate + + reg: + maxItems: 1 + + clocks: + minItems: 1 + maxItems: 3 + description: + Should be the input parent clock(s) phandle for the clock, this + property just simply shows which clock group the clocks' parents + are in, since each clk node would represent many clocks which are + defined in the driver. The detailed dependency relationship + (i.e. how many parents and which are the parents) are implemented + in driver code. + + '#clock-cells': + const: 1 + + sprd,syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: + phandle to the syscon which is in the same address area with the + clock, and so we can get regmap for the clocks from the syscon device + +oneOf: + - required: + - reg + - required: + - sprd,syscon + +required: + - compatible + - clocks + - '#clock-cells' + +additionalProperties: false + +examples: + - | + soc { + #address-cells = <2>; + #size-cells = <2>; + + pmu-gate { + compatible = "sprd,sc9860-pmu-gate"; + clocks = <&ext_26m>; + #clock-cells = <1>; + sprd,syscon = <&pmu_regs>; + }; + + clock-controller@20000000 { + compatible = "sprd,sc9860-ap-clk"; + reg = <0 0x20000000 0 0x400>; + clocks = <&ext_26m>, <&pll 0>, <&pmu_gate 0>; + #clock-cells = <1>; + }; + }; +... -- 2.34.1 . From: Matteo Martelli Subject: [PATCH 0/2] iio: adc: add support for pac1921 Date: Wed, 03 Jul 2024 15:34:34 +0200 Message-Id: <20240703-iio-pac1921-v1-0-54c47d9180b6@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Matteo Martelli Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266610 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-iio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add iio driver and DT binding for the Microchip PAC1921 Current/Power monitor. Implemented most of the features with few limitations listed in the driver commit message. Tested with a Pine64 host board connected to a PAC1921 click board [1] via I2C. The PAC1921 click board embeds the Microchip PAC1921 device and a 10 mOhms shunt resistor. The PAC1921 datasheet is at [2]. [1]: https://www.mikroe.com/pac1921-click [2]: https://ww1.microchip.com/downloads/en/DeviceDoc/PAC1921-Data-Sheet-DS20005293E.pdf Signed-off-by: Matteo Martelli --- Matteo Martelli (2): dt-bindings: iio: adc: add binding for pac1921 iio: adc: add support for pac1921 .../ABI/testing/sysfs-bus-iio-adc-pac1921 | 45 + .../bindings/iio/adc/microchip,pac1921.yaml | 79 ++ MAINTAINERS | 7 + drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/pac1921.c | 1033 ++++++++++++++++++++ 6 files changed, 1175 insertions(+) --- base-commit: 529d2e1900642eba6df28307e26e19793e227546 change-id: 20240606-iio-pac1921-77fa0fa3ac11 Best regards, -- Matteo Martelli . From: =?utf-8?q?Th=C3=A9o_Lebrun?= Subject: [PATCH v2 0/2] Add Mobileye EyeQ reset support Date: Wed, 03 Jul 2024 15:46:31 +0200 Message-Id: <20240703-mbly-reset-v2-0-3fe853d78139@bootlin.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vladimir Kondratiev , =?utf-8?q?Gr=C3=A9gory_Clement?= , Thomas Petazzoni , Tawfik Bayouk , =?utf-8?q?Th=C3=A9o_Lebrun?= Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266621 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is a new iteration on the Mobileye system-controller series. It used to be sent as a single series [0], but has been split in the previous revision (see [1], [2], [3], [4]) to faciliate merging. This series adds a platform driver handling SoC controllers resets. It is an auxiliary driver being instantiated by the platform clk driver. We support EyeQ5, EyeQ6L and EyeQ6H SoCs. The last one is special in that there are seven instances of this system-controller. Three of those (west, east, acc) contain a reset section. Related series are targeted at clk [5], pinctrl [6] and MIPS [4]. The first two are receiving a second version. The last one has no change and stays at its V1. Have a nice day, Théo [0]: https://lore.kernel.org/lkml/20240620-mbly-olb-v3-0-5f29f8ca289c@bootlin.com/ [1]: https://lore.kernel.org/lkml/20240628-mbly-clk-v1-0-edb1e29ea4c1@bootlin.com/ [2]: https://lore.kernel.org/lkml/20240628-mbly-reset-v1-0-2a8294fd4392@bootlin.com/ [3]: https://lore.kernel.org/lkml/20240628-mbly-pinctrl-v1-0-c878192d6b0a@bootlin.com/ [4]: https://lore.kernel.org/lkml/20240628-mbly-mips-v1-0-f53f5e4c422b@bootlin.com/ [5]: https://lore.kernel.org/lkml/20240703-mbly-clk-v2-0-fe8c6199a579@bootlin.com/ [6]: https://lore.kernel.org/lkml/20240703-mbly-pinctrl-v2-0-eab5f69f1b01@bootlin.com/ Signed-off-by: Théo Lebrun --- Changes in v2: - Kconfig: replace "depends on AUXILIARY_BUS" by "select AUXILIARY_BUS". - driver: - turn rcdev_to_priv() into a static function to avoid a gnarly container_of(rcdev, ..., rcdev) bug and use the typesystem. - eqr_busy_wait_locked(): - assign values to base, sleep_us and timeout_us in the variable declaration block rather than later down the function. - fix indent of the conditional in the read_poll_timeout() call. - rename val0 to rst_status and val1 to clk_status. - eqr_status(): reorder variable declarations for offset and domain to be next to each other. - add comment expanding on usage of mutexes in the device private data. - add comments mentioning that both RST_REQUEST and CLK_REQUEST registers must be kept in sync, in both assert and deassert code. - Link to v1: see [2] Changes since OLB v3 [0]: - MAINTAINERS: Move changes into a separate commit to avoid merge conflicts. This commit is in the MIPS series [3]. - dt-bindings: Take Reviewed-by: Rob Herring. - Kconfig: do not depend on COMMON_CLK_EYEQ. This symbol is not defined in this series, it is defined in the clk series [1]. - Kconfig: do depend on AUXILIARY_BUS. - Kconfig: remove outdated "depends on MFD_SYSCON". - driver: remove "#include ". - driver: cast platdata to (void _iomem *) explicitely. --- Théo Lebrun (2): Revert "dt-bindings: reset: mobileye,eyeq5-reset: add bindings" reset: eyeq: add platform driver .../bindings/reset/mobileye,eyeq5-reset.yaml | 43 -- drivers/reset/Kconfig | 13 + drivers/reset/Makefile | 1 + drivers/reset/reset-eyeq.c | 570 +++++++++++++++++++++ 4 files changed, 584 insertions(+), 43 deletions(-) --- base-commit: f2661062f16b2de5d7b6a5c42a9a5c96326b8454 change-id: 20240628-mbly-reset-ac6c66d3bf95 Best regards, -- Théo Lebrun . From: =?utf-8?q?Th=C3=A9o_Lebrun?= Subject: [PATCH v2 0/2] Add Mobileye EyeQ5 pinctrl support Date: Wed, 03 Jul 2024 15:46:46 +0200 Message-Id: <20240703-mbly-pinctrl-v2-0-eab5f69f1b01@bootlin.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Linus Walleij , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vladimir Kondratiev , =?utf-8?q?Gr=C3=A9gory_Clement?= , Thomas Petazzoni , Tawfik Bayouk , =?utf-8?q?Th=C3=A9o_Lebrun?= Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266623 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-gpio Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is a new iteration on the Mobileye system-controller series. It used to be sent as a single series [0], but has been split in the previous revision (see [1], [2], [3], [4]) to faciliate merging. This series adds a driver handling EyeQ5 (and only EyeQ5, not EyeQ6L nor EyeQ6H) SoC pin config and muxing. It is an auxiliary driver being instantiated by the platform clk driver. Related series are targeted at clk [5], reset [6] and MIPS [4]. The first two are receiving a second version. The last one has no change and stays at its V1. Have a nice day, Théo [0]: https://lore.kernel.org/lkml/20240620-mbly-olb-v3-0-5f29f8ca289c@bootlin.com/ [1]: https://lore.kernel.org/lkml/20240628-mbly-clk-v1-0-edb1e29ea4c1@bootlin.com/ [2]: https://lore.kernel.org/lkml/20240628-mbly-reset-v1-0-2a8294fd4392@bootlin.com/ [3]: https://lore.kernel.org/lkml/20240628-mbly-pinctrl-v1-0-c878192d6b0a@bootlin.com/ [4]: https://lore.kernel.org/lkml/20240628-mbly-mips-v1-0-f53f5e4c422b@bootlin.com/ [5]: https://lore.kernel.org/lkml/20240703-mbly-clk-v2-0-fe8c6199a579@bootlin.com/ [6]: https://lore.kernel.org/lkml/20240703-mbly-reset-v2-0-3fe853d78139@bootlin.com/ Signed-off-by: Théo Lebrun --- Changes in v2: - Kconfig: replace "depends on AUXILIARY_BUS" by "select AUXILIARY_BUS". - Kconfig: add "depends on OF" for pinconf_generic_dt_node_to_map_pin(). - driver: cast dev_get_platdata()'s return value to (void __iomem *). - Link to v1: see [3] Changes since OLB v3 [0]: - MAINTAINERS: Move changes into a separate commit to avoid merge conflicts. This commit is in the MIPS series [3]. - dt-bindings: Take Reviewed-by: Rob Herring and Linus Walleij. - Kconfig: do not depend on COMMON_CLK_EYEQ. This symbol is not defined in this series, it is defined in the clk series [1]. - Kconfig: do depend on AUXILIARY_BUS. - Kconfig: remove outdated "select MFD_SYSCON". - driver: remove "#include ". --- Théo Lebrun (2): Revert "dt-bindings: pinctrl: mobileye,eyeq5-pinctrl: add bindings" pinctrl: eyeq5: add platform driver .../bindings/pinctrl/mobileye,eyeq5-pinctrl.yaml | 242 --------- drivers/pinctrl/Kconfig | 15 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-eyeq5.c | 575 +++++++++++++++++++++ 4 files changed, 591 insertions(+), 242 deletions(-) --- base-commit: f2661062f16b2de5d7b6a5c42a9a5c96326b8454 change-id: 20240628-mbly-pinctrl-bf76bf390a7c Best regards, -- Théo Lebrun . From: Christian Eggers To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter CC: David Lechner , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , , , Christian Eggers Subject: [RFC PATCH] drm/tiny: Add support for Sitronix ST7539 Date: Wed, 3 Jul 2024 16:05:04 +0200 Message-ID: <20240703140504.8518-1-ceggers@arri.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1266638 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Based on the existing ST7586 driver. But the ST7539 ... - is monochrome only - has 8 VERTICAL pixels per byte - doesn't support any MIPI DCS commands - has (a few) 16 bit commands - doesn't support setting a clipping rect when writing to the RAM - doesn't support rotation (only mirroring of X and/or Y axis) Questions/TODO: - should drivers for such old displays be mainlined? - shall I use mipi_dbi_ although the display doesn't implement MIPI DCS (and has some 16 bit commands)? - can the conversion to 8 vertical pixels/byte (taken from solomon/ssd130x.c) be avoided / simplified / made more efficient? - how to implement setting of the display contrast (required by my application)? - add device tree binding Signed-off-by: Christian Eggers --- MAINTAINERS | 6 + drivers/gpu/drm/tiny/Kconfig | 11 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/st7539.c | 424 ++++++++++++++++++++++++++++++++++ 4 files changed, 442 insertions(+) create mode 100644 drivers/gpu/drm/tiny/st7539.c diff --git a/MAINTAINERS b/MAINTAINERS index e7d543cf9f6c..7191206c1ae3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7116,6 +7116,12 @@ S: Maintained F: Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml F: drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c +DRM DRIVER FOR SITRONIX ST7539 PANELS +M: Christian Eggers +S: Maintained +T: git https://gitlab.freedesktop.org/drm/misc/kernel.git +F: drivers/gpu/drm/tiny/st7539.c + DRM DRIVER FOR SITRONIX ST7586 PANELS M: David Lechner S: Maintained diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index f6889f649bc1..220d2aee9354 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -186,6 +186,17 @@ config TINYDRM_REPAPER If M is selected the module will be called repaper. +config TINYDRM_ST7539 + tristate "DRM support for Sitronix ST7539 display panels" + depends on DRM && SPI + select DRM_KMS_HELPER + select DRM_GEM_DMA_HELPER + select DRM_MIPI_DBI + help + DRM driver for Sitronix ST7539 panels. + + If M is selected the module will be called st7539. + config TINYDRM_ST7586 tristate "DRM support for Sitronix ST7586 display panels" depends on DRM && SPI diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile index 76dde89a044b..0bd217779995 100644 --- a/drivers/gpu/drm/tiny/Makefile +++ b/drivers/gpu/drm/tiny/Makefile @@ -14,5 +14,6 @@ obj-$(CONFIG_TINYDRM_ILI9341) += ili9341.o obj-$(CONFIG_TINYDRM_ILI9486) += ili9486.o obj-$(CONFIG_TINYDRM_MI0283QT) += mi0283qt.o obj-$(CONFIG_TINYDRM_REPAPER) += repaper.o +obj-$(CONFIG_TINYDRM_ST7539) += st7539.o obj-$(CONFIG_TINYDRM_ST7586) += st7586.o obj-$(CONFIG_TINYDRM_ST7735R) += st7735r.o diff --git a/drivers/gpu/drm/tiny/st7539.c b/drivers/gpu/drm/tiny/st7539.c new file mode 100644 index 000000000000..9a6aeea006ef --- /dev/null +++ b/drivers/gpu/drm/tiny/st7539.c @@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * DRM driver for Sitronix ST7539 panels + * + * Copyright 2024 Christian Eggers + * + * based on st7586.c + * Copyright 2017 David Lechner + */ + +#include +#include +#include +#include +#include +#include