From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FF89C10F11 for ; Wed, 24 Apr 2019 16:22:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B21E208E4 for ; Wed, 24 Apr 2019 16:22:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="gC4PX71h" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732249AbfDXQWQ (ORCPT ); Wed, 24 Apr 2019 12:22:16 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:49386 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727393AbfDXQWQ (ORCPT ); Wed, 24 Apr 2019 12:22:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=CLpOOhimgf1EsQaEKg30BEHyUNBmt+zFeaIbXKiD0MQ=; b=gC4PX71hgEl3/scNu4vev1CQV Otyp4rcgGeaHsTWA43gWpDS2Yr2SGhYfCWN8RNAJQYsQOHBZ5jMFRYbIDc34b0dk8yk09MM9dy80I 7Q9qS/ENdurKOUqmK9bYs1bgK0qZ9vNAF0G6DxDANQfpTsscioPox6RsFHJuF18HsSx4PlP2lx9vW PKM/5FU5lJ0pn+TcWGyGsB6k4F9Hm+xcopyiNxdOt1EePDeDxV0tYjH9Vk68zF5rZZ8WDGVpn/MX8 aQEEjMyYcwpi8lpgz7ymEjHfV94JE3Yls50socIygKyEtlPoT3sFvc2bQxYxp6B3s/ZmiYgJk58VC HHO+/KnUw==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=hirez.programming.kicks-ass.net) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJKex-0007Oj-0z; Wed, 24 Apr 2019 16:22:11 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 652F1203C0A58; Wed, 24 Apr 2019 18:22:09 +0200 (CEST) Date: Wed, 24 Apr 2019 18:22:09 +0200 From: Peter Zijlstra To: Josh Poimboeuf Cc: Randy Dunlap , Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: Tree for Apr 17 (objtool) Message-ID: <20190424162209.GQ11158@hirez.programming.kicks-ass.net> References: <20190417173117.196b5ac6@canb.auug.org.au> <7114e2f5-0c1f-c5e4-177c-2a5c61d12d58@infradead.org> <20190424160357.6olyocstevbz7wnw@treble> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190424160357.6olyocstevbz7wnw@treble> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 24, 2019 at 11:03:57AM -0500, Josh Poimboeuf wrote: > On Wed, Apr 17, 2019 at 08:41:34AM -0700, Randy Dunlap wrote: > > on x86_64: > > > > CC drivers/gpu/drm/i915/i915_gem_execbuffer.o > > drivers/gpu/drm/i915/i915_gem_execbuffer.o: warning: objtool: .altinstr_replacement+0x18: redundant UACCESS disable > I haven't looked at this, do you know if this is the same issue as the > other note from Randy, or something else? That smells like the below commit went missing... But I cannot reproduce when building next/master myself. --- commit 8f4faed01e3015955801c8ef066ec7fd7a8b3902 Author: Peter Zijlstra Date: Thu Feb 28 13:52:31 2019 +0100 i915, uaccess: Fix redundant CLAC New tooling noticed this: drivers/gpu/drm/i915/i915_gem_execbuffer.o: warning: objtool: .altinstr_replacement+0x3c: redundant UACCESS disable drivers/gpu/drm/i915/i915_gem_execbuffer.o: warning: objtool: .altinstr_replacement+0x66: redundant UACCESS disable You don't need user_access_end() if user_access_begin() fails. Signed-off-by: Peter Zijlstra (Intel) Cc: Borislav Petkov Cc: Chris Wilson Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Ingo Molnar diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 02adcaf6ebea..16f80a448820 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1667,6 +1667,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) len)) { end_user: user_access_end(); +end: kvfree(relocs); err = -EFAULT; goto err; @@ -1686,7 +1687,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) * relocations were valid. */ if (!user_access_begin(urelocs, size)) - goto end_user; + goto end; for (copied = 0; copied < nreloc; copied++) unsafe_put_user(-1, @@ -2695,7 +2696,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, * when we did the "copy_from_user()" above. */ if (!user_access_begin(user_exec_list, count * sizeof(*user_exec_list))) - goto end_user; + goto end; for (i = 0; i < args->buffer_count; i++) { if (!(exec2_list[i].offset & UPDATE)) @@ -2709,6 +2710,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, } end_user: user_access_end(); +end:; } args->flags &= ~__I915_EXEC_UNKNOWN_FLAGS;