From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Nathan Chancellor <natechancellor@gmail.com>,
clang-built-linux <clang-built-linux@googlegroups.com>,
x86@kernel.org, Arnd Bergmann <arnd@arndb.de>,
Sedat Dilek <sedat.dilek@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: x86 - clang / objtool status
Date: Tue, 23 Jul 2019 21:43:24 -0500 [thread overview]
Message-ID: <20190724023946.yxsz5im22fz4zxrn@treble> (raw)
In-Reply-To: <alpine.DEB.2.21.1907182223560.1785@nanos.tec.linutronix.de>
On Thu, Jul 18, 2019 at 10:40:09PM +0200, Thomas Gleixner wrote:
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.o: warning: objtool: .altinstr_replacement+0x86: redundant UACCESS disable
Looking at this one, I think I agree with objtool.
PeterZ, Linus, I know y'all discussed this code a few months ago.
__copy_from_user() already does a CLAC in its error path. So isn't the
user_access_end() redundant for the __copy_from_user() error path?
Untested fix:
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 5fae0e50aad0..41dab9ea33cd 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1628,6 +1628,7 @@ static int check_relocations(const struct drm_i915_gem_exec_object2 *entry)
static int eb_copy_relocations(const struct i915_execbuffer *eb)
{
+ struct drm_i915_gem_relocation_entry *relocs;
const unsigned int count = eb->buffer_count;
unsigned int i;
int err;
@@ -1635,7 +1636,6 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
for (i = 0; i < count; i++) {
const unsigned int nreloc = eb->exec[i].relocation_count;
struct drm_i915_gem_relocation_entry __user *urelocs;
- struct drm_i915_gem_relocation_entry *relocs;
unsigned long size;
unsigned long copied;
@@ -1663,14 +1663,8 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
if (__copy_from_user((char *)relocs + copied,
(char __user *)urelocs + copied,
- len)) {
-end_user:
- user_access_end();
-end:
- kvfree(relocs);
- err = -EFAULT;
- goto err;
- }
+ len))
+ goto end;
copied += len;
} while (copied < size);
@@ -1699,10 +1693,14 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
return 0;
+end_user:
+ user_access_end();
+end:
+ kvfree(relocs);
+ err = -EFAULT;
err:
while (i--) {
- struct drm_i915_gem_relocation_entry *relocs =
- u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);
+ relocs = u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);
if (eb->exec[i].relocation_count)
kvfree(relocs);
}
next prev parent reply other threads:[~2019-07-24 2:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 20:40 Thomas Gleixner
2019-07-18 20:58 ` Nathan Chancellor
2019-07-19 6:39 ` Thomas Gleixner
2019-07-19 7:00 ` Arnd Bergmann
2019-07-19 7:03 ` Nathan Chancellor
2019-07-24 16:57 ` Nick Desaulniers
2019-07-18 22:42 ` Nick Desaulniers
2019-07-19 6:44 ` Thomas Gleixner
2019-07-19 11:37 ` Sedat Dilek
2019-07-19 13:48 ` Sedat Dilek
2019-07-22 15:40 ` Sedat Dilek
2019-07-25 6:17 ` Sedat Dilek
2019-07-24 2:43 ` Josh Poimboeuf [this message]
2019-07-24 7:47 ` Peter Zijlstra
2019-07-24 12:37 ` Josh Poimboeuf
2019-07-24 12:55 ` Josh Poimboeuf
2019-07-24 13:35 ` Peter Zijlstra
2019-07-24 14:05 ` Josh Poimboeuf
2019-07-24 14:10 ` Peter Zijlstra
2019-07-24 16:48 ` [PATCH] objtool: Improve UACCESS coverage Peter Zijlstra
2019-07-24 16:54 ` Nathan Chancellor
2019-07-24 16:55 ` Nick Desaulniers
2019-07-24 18:30 ` Sedat Dilek
2019-07-24 18:32 ` Sedat Dilek
2019-07-24 16:52 ` x86 - clang / objtool status Peter Zijlstra
2019-07-24 17:22 ` Nick Desaulniers
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=20190724023946.yxsz5im22fz4zxrn@treble \
--to=jpoimboe@redhat.com \
--cc=arnd@arndb.de \
--cc=clang-built-linux@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=natechancellor@gmail.com \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--cc=sedat.dilek@gmail.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/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
all inboxes | Powered by JetHome®