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=-5.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 C76BFC432C3 for ; Wed, 13 Nov 2019 20:30:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 54AC7206F2 for ; Wed, 13 Nov 2019 20:30:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Nn03DCxi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54AC7206F2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2A56D6B0008; Wed, 13 Nov 2019 15:30:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2561C6B000A; Wed, 13 Nov 2019 15:30:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16BC86B000C; Wed, 13 Nov 2019 15:30:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0071.hostedemail.com [216.40.44.71]) by kanga.kvack.org (Postfix) with ESMTP id 023106B0008 for ; Wed, 13 Nov 2019 15:30:52 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id AE95A180AD81F for ; Wed, 13 Nov 2019 20:30:52 +0000 (UTC) X-FDA: 76152397944.24.shock43_7a125c4fcb14 X-HE-Tag: shock43_7a125c4fcb14 X-Filterd-Recvd-Size: 4351 Received: from mail-yb1-f195.google.com (mail-yb1-f195.google.com [209.85.219.195]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 Nov 2019 20:30:52 +0000 (UTC) Received: by mail-yb1-f195.google.com with SMTP id k206so1507116ybb.5 for ; Wed, 13 Nov 2019 12:30:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=HhUJSPQDvSVcW6lExUu0Aos25QWc66JPMYbcEiKuXrc=; b=Nn03DCxiI7YI0L9xwwcV+FWANHJyX0Nosiah9C9ZEYM6RrUknHizEw0/Ycd051SlK3 p+Abqia/sM7br2NF1iq6mgg7c3AqnCya0VFzL+xCg6m/DvN2uAaXNdeI+hA1pF0mlLm7 lajPR7C6kVPLXfNzWmevC8ueutQUsmor9IfCJkTa6m9g1VjBQ0cCm0ROz3JWUfbpI+eB PiOheiqaWiP9+CJ6BJaOZOv4+4gGvcJ41Un+Wqvod2rKcV1KbUYOz4xORFCqDAbJgbQQ 562C+TZg0L8TjWX3oLB+QWrwC15uulzsY5TV58YDTkSLEnYd9pPzqLJ2FvpCLH1ZoccY jJiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HhUJSPQDvSVcW6lExUu0Aos25QWc66JPMYbcEiKuXrc=; b=U6YvWOJtoOFO0bemWINViDaYyCeo9PyJ5C+XpakhHJvBT67QbCb3+Gt4mG9LINQJm3 siSjsfgArFMye88XjSDUlm3cbF0jj/uFHTlWZuD0JIEUHiMXzG0hE2VG/iinMJEhzA02 hQ8eogoQzzSUiMQAFzN85U4hY+zPz4bPWo3yx7+IzIsE9J7dil0w6c//TLSwibvQVokz wS0uVnXPjryoti6ALP6tqBNNoMXj54iqr+jU4/LHbWMddHdHfwUAGjExOjqVKL/cUkfG fMA5gW52srUCppBoHIM7u5EwFv6N0cLBeGmo8nHq+TJwz5eyYyU7I4v7uIqpw2GQwzj1 Asyg== X-Gm-Message-State: APjAAAWoQqSG+I+nNuM7SwSOFuZtcHjgEeUejy/VMoJ5cFnls2CcalVL 5x3FkIsDMrG9AtPtknfjN8GhhXwCJoQ8J91vYtc= X-Google-Smtp-Source: APXvYqxtTDE1DuX7odfSWA32rCc5N/jNL04v+VM3rGUIhjMW0FCHmUvG7BWWqqzfvcrhoqFMyCvgmEKAHAX+rTFSN4k= X-Received: by 2002:a25:768d:: with SMTP id r135mr3778035ybc.25.1573677051679; Wed, 13 Nov 2019 12:30:51 -0800 (PST) MIME-Version: 1.0 References: <1572964400-16542-1-git-send-email-rppt@kernel.org> <1572964400-16542-3-git-send-email-rppt@kernel.org> In-Reply-To: <1572964400-16542-3-git-send-email-rppt@kernel.org> From: Max Filippov Date: Wed, 13 Nov 2019 12:30:39 -0800 Message-ID: Subject: Re: [PATCH 2/2] xtensa: get rid of __ARCH_USE_5LEVEL_HACK To: Mike Rapoport Cc: Chris Zankel , "open list:TENSILICA XTENSA PORT (xtensa)" , linux-mm@kvack.org, LKML , Mike Rapoport Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Mike, On Tue, Nov 5, 2019 at 6:33 AM Mike Rapoport wrote: > > From: Mike Rapoport > > xtensa has 2-level page tables and already uses pgtable-nopmd for page > table folding. > > Add walks of p4d level where appropriate and drop usage of > __ARCH_USE_5LEVEL_HACK. > > Signed-off-by: Mike Rapoport > --- > arch/xtensa/include/asm/pgtable.h | 1 - > arch/xtensa/mm/fault.c | 10 ++++++++-- > arch/xtensa/mm/kasan_init.c | 6 ++++-- > arch/xtensa/mm/mmu.c | 3 ++- > arch/xtensa/mm/tlb.c | 5 ++++- > 5 files changed, 18 insertions(+), 7 deletions(-) This change missed a spot in arch/xtensa/include/asm/fixmap.h. I've added the following hunk and queued both patches to the xtensa tree: diff --git a/arch/xtensa/include/asm/fixmap.h b/arch/xtensa/include/asm/fixmap.h index 7e25c1b50ac0..cfb8696917e9 100644 --- a/arch/xtensa/include/asm/fixmap.h +++ b/arch/xtensa/include/asm/fixmap.h @@ -78,8 +78,10 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr) #define kmap_get_fixmap_pte(vaddr) \ pte_offset_kernel( \ - pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), \ - (vaddr) \ - ) + pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), \ + (vaddr)), \ + (vaddr)), \ + (vaddr)), \ + (vaddr)) #endif -- Thanks. -- Max