Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1552859ybz; Sat, 18 Apr 2020 03:28:45 -0700 (PDT) X-Google-Smtp-Source: APiQypJPRwJnIFBCqWJc4wkZFP9bIsoz7fChhQAtpNwJjwgUOgQ5nnYybNcz4/uOdpGdnAGS4NrM X-Received: by 2002:a17:906:4f83:: with SMTP id o3mr7297711eju.14.1587205725596; Sat, 18 Apr 2020 03:28:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587205725; cv=none; d=google.com; s=arc-20160816; b=ozhktXLMC0l3xqz7vKgtRsrpkiSW/nK/LyrCNcgbKuE6OVKtFw1fCIN18Qufehekff 5DCWGyuAqybfVMGirQUEgO3SYt/Vh1Gtc7DPvk/wxms8Xp3JwS/SqZojHaNL2/VP5tql 8cHz+V1saHKhwQoEjE0XkPe7c2A8xrJm2R6VZhG9NBWvRCaTlvZVBOEtMbx11VuJ/wyq F0mf+varZ1qoYvQfZP371uRNle/8W7goKqRStU1JyMwyXH9GENXqTFBe/8V+QL53W4GO S9d0oUssrZwVObp9tP5qjDY6KLylXEHDmw+W+hybp1/pvacjhP8hBxTfLRI0S8cjOdLV 2njg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=4yQvd/N2Eyf5BnauOXAJrliryb/5tZFat8VJ44a17AE=; b=hvms24i0dgeA+lLMcqupOTiLmUClwQzPTItPugAfZhB1hY/5rWNEzhCSqzlu1WuWdA 1nMpQUuko4uh1qQKVP7AuqaIy4d5wiSQDyi+mi9FqZgQUJIrAJY0FMevy1foA/qhxayC m2mogIcoz8/mrRYZGKG2a2L0Eq2WBTp90NEP3sXxVPdJfKwoKFeNHUd0FDUQntIrUOZn xEMDqVt6Qhe6iqc9r3sB/vOYfKlfEr8xbPlOkFI6blGko5hB57WHqEogYTVwr7VMjrnC iewdyyMUOxEUAxRANmg4x0TyjuyZMJYByLu04LDpuGRYOlwXMaxzlikUfUCexW863Be6 Sdaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=lTVHLAys; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id do8si19356834ejc.149.2020.04.18.03.28.23; Sat, 18 Apr 2020 03:28:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=lTVHLAys; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725893AbgDRK1Y (ORCPT + 99 others); Sat, 18 Apr 2020 06:27:24 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:27933 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725857AbgDRK1Y (ORCPT ); Sat, 18 Apr 2020 06:27:24 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4948KP1dZTz9txXP; Sat, 18 Apr 2020 12:27:21 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=lTVHLAys; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id ajFKWz5ufkY3; Sat, 18 Apr 2020 12:27:21 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4948KP0XbJz9txXN; Sat, 18 Apr 2020 12:27:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1587205641; bh=4yQvd/N2Eyf5BnauOXAJrliryb/5tZFat8VJ44a17AE=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=lTVHLAysl7oV1D7KXm0SyGupVDGv9wTBI2RQKQc8xd7pODGl9Jk+8uXZ03tOUv2Yr lTcxqzaMzh6yhLuwgf9HXjtPj3NRlIWsSsb8pYIC61P0sRh9ZvvaJZSv4n82L2XlYf It9ER6JCvt+x4nROfC+khSKgkywWZAf53Uf6YP2g= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6776C8B772; Sat, 18 Apr 2020 12:27:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id JfwsOQZOxAxe; Sat, 18 Apr 2020 12:27:22 +0200 (CEST) Received: from [192.168.4.90] (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 023D58B75E; Sat, 18 Apr 2020 12:27:21 +0200 (CEST) Subject: Re: [RFC PATCH] powerpc/lib: Fixing use a temporary mm for code patching To: Christopher M Riedl Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org References: <581069710.188209.1586927814880@privateemail.com> <1418874364.198277.1586967776509@privateemail.com> From: Christophe Leroy Message-ID: <3a37ab41-ab0e-6fae-9fbe-710f83a945f2@c-s.fr> Date: Sat, 18 Apr 2020 12:27:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <1418874364.198277.1586967776509@privateemail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 15/04/2020 à 18:22, Christopher M Riedl a écrit : >> On April 15, 2020 4:12 AM Christophe Leroy wrote: >> >> >> Le 15/04/2020 à 07:16, Christopher M Riedl a écrit : >>>> On March 26, 2020 9:42 AM Christophe Leroy wrote: >>>> >>>> >>>> This patch fixes the RFC series identified below. >>>> It fixes three points: >>>> - Failure with CONFIG_PPC_KUAP >>>> - Failure to write do to lack of DIRTY bit set on the 8xx >>>> - Inadequaly complex WARN post verification >>>> >>>> However, it has an impact on the CPU load. Here is the time >>>> needed on an 8xx to run the ftrace selftests without and >>>> with this series: >>>> - Without CONFIG_STRICT_KERNEL_RWX ==> 38 seconds >>>> - With CONFIG_STRICT_KERNEL_RWX ==> 40 seconds >>>> - With CONFIG_STRICT_KERNEL_RWX + this series ==> 43 seconds >>>> >>>> Link: https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=166003 >>>> Signed-off-by: Christophe Leroy >>>> --- >>>> arch/powerpc/lib/code-patching.c | 5 ++++- >>>> 1 file changed, 4 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c >>>> index f156132e8975..4ccff427592e 100644 >>>> --- a/arch/powerpc/lib/code-patching.c >>>> +++ b/arch/powerpc/lib/code-patching.c >>>> @@ -97,6 +97,7 @@ static int map_patch(const void *addr, struct patch_mapping *patch_mapping) >>>> } >>>> >>>> pte = mk_pte(page, pgprot); >>>> + pte = pte_mkdirty(pte); >>>> set_pte_at(patching_mm, patching_addr, ptep, pte); >>>> >>>> init_temp_mm(&patch_mapping->temp_mm, patching_mm); >>>> @@ -168,7 +169,9 @@ static int do_patch_instruction(unsigned int *addr, unsigned int instr) >>>> (offset_in_page((unsigned long)addr) / >>>> sizeof(unsigned int)); >>>> >>>> + allow_write_to_user(patch_addr, sizeof(instr)); >>>> __patch_instruction(addr, instr, patch_addr); >>>> + prevent_write_to_user(patch_addr, sizeof(instr)); >>>> >>> >>> On radix we can map the page with PAGE_KERNEL protection which ends up >>> setting EAA[0] in the radix PTE. This means the KUAP (AMR) protection is >>> ignored (ISA v3.0b Fig. 35) since we are accessing the page from MSR[PR]=0. >>> >>> Can we employ a similar approach on the 8xx? I would prefer *not* to wrap >>> the __patch_instruction() with the allow_/prevent_write_to_user() KUAP things >>> because this is a temporary kernel mapping which really isn't userspace in >>> the usual sense. >> >> On the 8xx, that's pretty different. >> >> The PTE doesn't control whether a page is user page or a kernel page. >> The only thing that is set in the PTE is whether a page is linked to a >> given PID or not. >> PAGE_KERNEL tells that the page can be addressed with any PID. >> >> The user access right is given by a kind of zone, which is in the PGD >> entry. Every pages above PAGE_OFFSET are defined as belonging to zone 0. >> Every pages below PAGE_OFFSET are defined as belonging to zone 1. >> >> By default, zone 0 can only be accessed by kernel, and zone 1 can only >> be accessed by user. When kernel wants to access zone 1, it temporarily >> changes properties of zone 1 to allow both kernel and user accesses. >> >> So, if your mapping is below PAGE_OFFSET, it is in zone 1 and kernel >> must unlock it to access it. >> >> >> And this is more or less the same on hash/32. This is managed by segment >> registers. One segment register corresponds to a 256Mbytes area. Every >> pages below PAGE_OFFSET can only be read by default by kernel. Only user >> can write if the PTE allows it. When the kernel needs to write at an >> address below PAGE_OFFSET, it must change the segment properties in the >> corresponding segment register. >> >> So, for both cases, if we want to have it local to a task while still >> allowing kernel access, it means we have to define a new special area >> between TASK_SIZE and PAGE_OFFSET which belongs to kernel zone. >> >> That looks complex to me for a small benefit, especially as 8xx is not >> SMP and neither are most of the hash/32 targets. >> > > Agreed. So I guess the solution is to differentiate between radix/non-radix > and use PAGE_SHARED for non-radix along with the KUAP functions when KUAP > is enabled. Hmm, I need to think about this some more, especially if it's > acceptable to temporarily map kernel text as PAGE_SHARED for patching. Do > you see any obvious problems on 8xx and hash/32 w/ using PAGE_SHARED? No it shouldn't be a problem AFAICS, except maybe the CPU overhead it brings as I mentioned previously (ftrace selftests going from 40 to 43 seconds ie 8% overhead. > > I don't necessarily want to drop the local mm patching idea for non-radix > platforms since that means we would have to maintain two implementations. > What's the problem with RADIX, why can't PAGE_SHARED be used on radix ? Christophe