From: Mark Brown <broonie@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Christian Brauner <brauner@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yongxin Yang <yangyongxin@kylinos.cn>
Subject: linux-next: manual merge of the mm-nonmm-unstable tree with the vfs-brauner-fixes tree
Date: Mon, 16 Nov 2026 15:53:44 +0000 [thread overview]
Message-ID: <avsnCFn0jCvbhtRw@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 3298 bytes --]
Hi all,
Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
kernel/profile.c
between commit:
944b8062bc6f6 ("profiling: report it when /proc/profile can't be created")
from the vfs-brauner-fixes tree and commit:
091be6dce28ab ("perf/profile: report failure to create /proc/profile")
from the mm-nonmm-unstable 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.
diff --combined kernel/profile.c
index 820d5ec909d40,818098cc094a5..0000000000000
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@@ -153,28 -153,52 +153,52 @@@ void profile_tick(int type
static ssize_t
read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
{
- unsigned long p = *ppos;
- ssize_t read;
- char *pnt;
- unsigned int sample_step = (unsigned int)(1UL << prof_shift);
+ const size_t header_size = sizeof(unsigned int);
+ const size_t file_size = (prof_len + 1) * sizeof(unsigned int);
+ unsigned int sample_step;
+ loff_t offset = *ppos;
+ size_t pos;
+ size_t done = 0;
+ size_t n, not_copied;
- if (p >= (prof_len+1)*sizeof(unsigned int))
+ /* Keep the shift word-sized before narrowing to the 32-bit ABI. */
+ sample_step = (unsigned int)(1UL << prof_shift);
+
+ if (offset < 0)
+ return -EINVAL;
+ if (offset >= file_size)
return 0;
- if (count > (prof_len+1)*sizeof(unsigned int) - p)
- count = (prof_len+1)*sizeof(unsigned int) - p;
- read = 0;
+ pos = offset;
+ count = min(count, file_size - pos);
- while (p < sizeof(unsigned int) && count > 0) {
- if (put_user(*((char *)(&sample_step)+p), buf))
- return -EFAULT;
- buf++; p++; count--; read++;
+ /* Copy the four-byte sampling resolution. */
+ if (pos < header_size) {
+ n = min(count, header_size - pos);
+ not_copied = copy_to_user(buf, (u8 *)&sample_step + pos, n);
+ done += n - not_copied;
+ if (not_copied)
+ goto fault;
+ buf += n;
+ pos += n;
+ count -= n;
}
- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
- if (copy_to_user(buf, (void *)pnt, count))
+
+ /* Copy raw counters using offsets relative to the counter array. */
+ if (count) {
+ not_copied = copy_to_user(buf,
+ (u8 *)prof_buffer + pos - header_size,
+ count);
+ done += count - not_copied;
+ if (not_copied)
+ goto fault;
+ }
+ *ppos += done;
+ return done;
+ fault:
+ *ppos += done;
+ if (!done)
return -EFAULT;
- read += count;
- *ppos += read;
- return read;
+ return done;
}
/* default is to not implement this call */
@@@ -221,8 -245,10 +245,8 @@@ int __ref create_proc_profile(void
return 0;
entry = proc_create("profile", S_IWUSR | S_IRUGO,
NULL, &profile_proc_ops);
- if (!entry) {
- pr_err("profile: failed to create /proc/profile\n");
+ if (!entry)
return -ENOMEM;
- }
proc_set_size(entry, (1 + prof_len) * sizeof(atomic_t));
return 0;
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-16 15:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 15:53 Mark Brown [this message]
2026-11-16 21:42 ` [PATCH linux-next] profiling: keep the error message in the mm-nonmm-unstable merge Sasha Levin
2026-11-16 21:51 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2026-09-23 9:33 linux-next: manual merge of the mm-nonmm-unstable tree with the vfs-brauner-fixes tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=avsnCFn0jCvbhtRw@sirena.org.uk \
--to=broonie@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yangyongxin@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox