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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3273CC77B7A for ; Sat, 3 Jun 2023 03:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236800AbjFCDRR (ORCPT ); Fri, 2 Jun 2023 23:17:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbjFCDRM (ORCPT ); Fri, 2 Jun 2023 23:17:12 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E26ABD; Fri, 2 Jun 2023 20:17:11 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QY4fz02sYz18Lk5; Sat, 3 Jun 2023 11:12:27 +0800 (CST) Received: from [10.174.151.185] (10.174.151.185) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sat, 3 Jun 2023 11:17:08 +0800 Subject: Re: [PATCH] x86/mce: remove unused mce_vaddr To: Alison Schofield CC: , , , , , , , , References: <20230528113545.650533-1-linmiaohe@huawei.com> From: Miaohe Lin Message-ID: <6f36b268-0717-1bb4-6f78-53758a88c04a@huawei.com> Date: Sat, 3 Jun 2023 11:17:08 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.151.185] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023/5/31 3:16, Alison Schofield wrote: > On Sun, May 28, 2023 at 07:35:45PM +0800, Miaohe Lin wrote: >> Since commit a6e3cf70b772 ("x86/mce: Change to not send SIGBUS error during >> copy from user"), mce_vaddr is not used anymore. Remove it and clean up the >> relevant code. > > Hi Miaohe, > > Not so sure that the 'clean up' part is useful. See below. > > >> >> Signed-off-by: Miaohe Lin >> --- >> arch/x86/kernel/cpu/mce/severity.c | 7 +------ >> include/linux/sched.h | 1 - >> 2 files changed, 1 insertion(+), 7 deletions(-) >> >> diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c >> index c4477162c07d..0acc0039de81 100644 >> --- a/arch/x86/kernel/cpu/mce/severity.c >> +++ b/arch/x86/kernel/cpu/mce/severity.c >> @@ -252,12 +252,7 @@ static bool is_copy_from_user(struct pt_regs *regs) >> return false; >> } >> >> - if (fault_in_kernel_space(addr)) >> - return false; >> - >> - current->mce_vaddr = (void __user *)addr; >> - >> - return true; >> + return !fault_in_kernel_space(addr); >> } > > > Refactoring the return is unnecessary and seems less readable. > How about removing the assignment, and leaving the rest, as is: > > diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c > index c4477162c07d..1c03221ddcb1 100644 > --- a/arch/x86/kernel/cpu/mce/severity.c > +++ b/arch/x86/kernel/cpu/mce/severity.c > @@ -255,8 +255,6 @@ static bool is_copy_from_user(struct pt_regs *regs) > if (fault_in_kernel_space(addr)) > return false; > > - current->mce_vaddr = (void __user *)addr; > - > return true; > } > Sounds good to me. Will do it in v2. Thanks for your advice.