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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD21BC0502F for ; Mon, 29 Aug 2022 06:42:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E43E4940008; Mon, 29 Aug 2022 02:42:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF34F940007; Mon, 29 Aug 2022 02:42:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CBAD7940008; Mon, 29 Aug 2022 02:42:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B9FC7940007 for ; Mon, 29 Aug 2022 02:42:14 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8F0C11A01F3 for ; Mon, 29 Aug 2022 06:42:14 +0000 (UTC) X-FDA: 79851685788.17.03410D1 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by imf21.hostedemail.com (Postfix) with ESMTP id 480A21C0012 for ; Mon, 29 Aug 2022 06:42:14 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id k6-20020a05600c1c8600b003a54ecc62f6so3897110wms.5 for ; Sun, 28 Aug 2022 23:42:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc; bh=EtBowJCOg4bZf/seKGBDDB2Td0pD664BFJhFwsUws4E=; b=JzFa8ZXk4k4FIgrpTmd8xr/Fml1Bxzh/zc8n8yDNQ17Q6WUGtq9uRFdTSBKUjCq9m6 yDAEDD+bk0PEElLYUsd9rMJFoxHs8f1Cn3bp3yf/3aEL3QjcS/18klbgYVzUUMxjvKXn My/ce7F8sjd43ihFxOsSYiM4nU+pi3OV8RWN1CtIKFPKNcX+/+5EO2vE6TKypHjSPFo+ ywACbvkaox9gdsnH9/A3QX/V5as1oVr4C8p7asP/Rm64lzk+LwxhWCcA3zLEiXdte8Ro Mouv6wn63AyYBNZwsTyg2Ar9Xh7KKdHKJtLbrljMLLS6meI25K0vI7+2BbzMrVM0dy3b mgGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=EtBowJCOg4bZf/seKGBDDB2Td0pD664BFJhFwsUws4E=; b=zRuJjk0rAFnaA7kmM02D4LEe5z+EUJNBOrRjsGwSmQH6mxOBtFEqLhw/qU8LcjwUjn 18EXSSaDva2hoHAa/5/mellrgiS4SIwsSR20eMmxoiF8WFH8IOJ6TWq4YNtH1NgSk1su 6CjDIsnBks/hHR9E70Uc4CvwRUbjhPCkDKdiR/gOX5nCm0Bx0AkvcT5U9y70PKlMnuY8 4waTF8r7HNTexI5FNDFwG9c2OnS4q9nCSd5VAQWwF1osXBsm/6mZ2+nImjDewdlGZsly tlBEGWh36iGYzs/b3Ag043sWxMM/yKVpIi/OMZVifq8TjwvRY0PkpHC20qOx5RwRsvUG oVvQ== X-Gm-Message-State: ACgBeo2Xa2+lAjSJf6uNW77g1SiA+pA/CEToNObO1FNlKA40v0NLu7/o DaBsnxDjTRRSs6D9lliEl1A/ACVzyAU= X-Google-Smtp-Source: AA6agR7GZBXQq8tJ1YNGsHzfy52ilSO1EuETNVmd+tTqGDa3GcHyWp5N5vBiDdugcDtXotuoprlTXw== X-Received: by 2002:a05:600c:1c8d:b0:3a6:9d60:faf0 with SMTP id k13-20020a05600c1c8d00b003a69d60faf0mr6003665wms.82.1661755332985; Sun, 28 Aug 2022 23:42:12 -0700 (PDT) Received: from localhost ([2a03:b0c0:1:d0::dee:c001]) by smtp.gmail.com with ESMTPSA id j27-20020a05600c1c1b00b003a31fd05e0fsm11009235wms.2.2022.08.28.23.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 23:42:12 -0700 (PDT) Date: Mon, 29 Aug 2022 06:42:12 +0000 From: Stafford Horne To: Baoquan He Cc: Christoph Hellwig , linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, linux-arm-kernel@lists.infradead.org, Jonas Bonn , Stefan Kristiansson , openrisc@lists.librecores.org Subject: Re: [PATCH v2 07/11] openrisc: mm: Convert to GENERIC_IOREMAP Message-ID: References: <20220820003125.353570-1-bhe@redhat.com> <20220820003125.353570-8-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661755334; a=rsa-sha256; cv=none; b=gE0IwnaWCxKA+/CIYeVeodTWQxsbeSBWwWoZW5l7sP0VePgjn3PIt9k9YX9QuqV0FFFsy5 bEDI4nMb3hS0dhuRGGaYRSgLS6G8mtBj2TZJZ9C0M70D5u3CSAYpy+S8q7eh81PrumxaSD FHUb9Bm6yS/HqqFCqS19nlllt4n41Sw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JzFa8ZXk; spf=pass (imf21.hostedemail.com: domain of shorne@gmail.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=shorne@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661755334; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EtBowJCOg4bZf/seKGBDDB2Td0pD664BFJhFwsUws4E=; b=s0c2wfcJtb8WFjAaJSrUcTKkwEsPcgCNivIspFBgB3/Dc8aKif4Esjp5XE3U/L4Qp6QT6g WQ60IgbAGSnd0Eqwi1oNdNVTJ+6TO5FXW7wGMJJeOTTS4GWEfj0/E6Lu3cIFmD8s6yCKCP n0R09iYhhudeimdEP6X5Rtjvq7HnB/8= X-Rspam-User: X-Rspamd-Queue-Id: 480A21C0012 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JzFa8ZXk; spf=pass (imf21.hostedemail.com: domain of shorne@gmail.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=shorne@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: yiwimja715xjd6d6gp5hyuyji93nqx1g X-Rspamd-Server: rspam07 X-HE-Tag: 1661755334-184872 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000062, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Aug 29, 2022 at 09:40:24AM +0800, Baoquan He wrote: > On 08/21/22 at 12:03am, Christoph Hellwig wrote: > > > + if (unlikely(!mem_init_done)) { > > > if ((fixmaps_used + (size >> PAGE_SHIFT)) > FIX_N_IOREMAPS) > > > + return IOMEM_ERR_PTR(ret); > > > v = fix_to_virt(FIX_IOREMAP_BEGIN + fixmaps_used); > > > fixmaps_used += (size >> PAGE_SHIFT); > > > > > > + if (ioremap_page_range(v, v + size, p, __pgprot(*prot_val))) { > > > fixmaps_used -= (size >> PAGE_SHIFT); > > > + return IOMEM_ERR_PTR(ret); > > > + } > > > + > > > + return (void __iomem *)(offset + (char *)v); > > > } > > > > This code needs to go away, and all very early boot uses of ioremap > > need to switch to use early_ioremap insted. > > Makes sense. On openrisc, the thing is I didn't find one place where > ioremap() is called in arch code. I can cut the early ioremap out and > wrap into a separate early_ioremap() function, however I don't know > where to put it. Not sure if I miss anything or openrisc doesn't really > need early ioremap. Hi, I don't know of any early_ioremap usage either in openrisc, maybe some drivers use it? However, we do not initialize any early_ioremap infrastructure in openrisc so that may cause issues if it is used. We can try to remove it all. I tested these below additional changes and they work, if you want to add them we can see if kbuild robots pick anything up. -Stafford diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c index bc41660e1fb0..ffe6d5e2b5fe 100644 --- a/arch/openrisc/mm/ioremap.c +++ b/arch/openrisc/mm/ioremap.c @@ -22,14 +22,10 @@ extern int mem_init_done; -static unsigned int fixmaps_used __initdata; - void __iomem * arch_ioremap(phys_addr_t *paddr, size_t size, unsigned long *prot_val) { - phys_addr_t p; - unsigned long v; - unsigned long offset, last_addr, addr = *paddr; + unsigned long last_addr, addr = *paddr; int ret = -EINVAL; /* Don't allow wraparound or zero size */ @@ -37,27 +33,6 @@ arch_ioremap(phys_addr_t *paddr, size_t size, unsigned long *prot_val) if (!size || last_addr < addr) return IOMEM_ERR_PTR(ret); - /* - * Mappings have to be page-aligned - */ - offset = addr & ~PAGE_MASK; - p = addr & PAGE_MASK; - size = PAGE_ALIGN(last_addr + 1) - p; - - if (unlikely(!mem_init_done)) { - if ((fixmaps_used + (size >> PAGE_SHIFT)) > FIX_N_IOREMAPS) - return IOMEM_ERR_PTR(ret); - v = fix_to_virt(FIX_IOREMAP_BEGIN + fixmaps_used); - fixmaps_used += (size >> PAGE_SHIFT); - - if (ioremap_page_range(v, v + size, p, __pgprot(*prot_val))) { - fixmaps_used -= (size >> PAGE_SHIFT); - return IOMEM_ERR_PTR(ret); - } - - return (void __iomem *)(offset + (char *)v); - } - return NULL; }