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=-13.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 1DAD1C432C0 for ; Tue, 26 Nov 2019 08:47:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B1CEB20722 for ; Tue, 26 Nov 2019 08:47:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1CEB20722 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 011856B02C1; Tue, 26 Nov 2019 03:47:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F04336B02C2; Tue, 26 Nov 2019 03:47:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCBB36B02C3; Tue, 26 Nov 2019 03:47:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0192.hostedemail.com [216.40.44.192]) by kanga.kvack.org (Postfix) with ESMTP id C21AD6B02C1 for ; Tue, 26 Nov 2019 03:47:33 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 6A7DF8249980 for ; Tue, 26 Nov 2019 08:47:33 +0000 (UTC) X-FDA: 76197799986.19.back36_7b08fbb00b46 X-HE-Tag: back36_7b08fbb00b46 X-Filterd-Recvd-Size: 7706 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 Nov 2019 08:47:32 +0000 (UTC) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xAQ8lGY0160642 for ; Tue, 26 Nov 2019 03:47:32 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0b-001b2d01.pphosted.com with ESMTP id 2wfju9uthm-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Nov 2019 03:47:31 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Nov 2019 08:47:29 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 26 Nov 2019 08:47:28 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xAQ8lRwR65732662 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Nov 2019 08:47:27 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3001542047; Tue, 26 Nov 2019 08:47:27 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AF5444203F; Tue, 26 Nov 2019 08:47:26 +0000 (GMT) Received: from linux.ibm.com (unknown [9.148.8.105]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Tue, 26 Nov 2019 08:47:26 +0000 (GMT) Date: Tue, 26 Nov 2019 10:47:25 +0200 From: Mike Rapoport To: Geert Uytterhoeven Cc: Andrew Morton , kbuild test robot , Linux Memory Management List , Mike Rapoport Subject: Re: [linux-next:master] BUILD REGRESSION b9d3d01405061bb42358fe53f824e894a1922ced References: <5ddb5317.or/pMNqm/YAp0XTV%lkp@intel.com> <20191125203342.a564d592deb6b140d3cab667@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-TM-AS-GCONF: 00 x-cbid: 19112608-0028-0000-0000-000003C018F6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19112608-0029-0000-0000-000024831999 Message-Id: <20191126084724.GB24228@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-26_01:2019-11-21,2019-11-26 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 priorityscore=1501 mlxscore=0 impostorscore=0 suspectscore=0 malwarescore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911260079 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 Geert, On Tue, Nov 26, 2019 at 09:10:22AM +0100, Geert Uytterhoeven wrote: > Hi Andrew, > > On Tue, Nov 26, 2019 at 5:33 AM Andrew Morton wrote: > > On Mon, 25 Nov 2019 12:05:43 +0800 kbuild test robot wrote: > > > tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master > > > branch HEAD: b9d3d01405061bb42358fe53f824e894a1922ced Add linux-next specific files for 20191122 > > > > > > Regressions in current branch: > > > > > > arch/m68k/mm/kmap.c:348:2: error: #endif without #if > > That one is fixed by your > m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix.patch. > > > > arch/m68k/mm/kmap.c:352:3: error: 'p4d_dir' undeclared (first use in this function); did you mean 'pmd_dir'? > > > arch/m68k/mm/kmap.c:353:3: error: 'pud_dir' undeclared (first use in this function); did you mean 'p4d_dir'? > > You lost the addition of > > + p4d_t *p4d_dir; > + pud_t *pud_dir; > > to kernel_set_cachemode(). > > > > arch/m68k/mm/kmap.c:76:24: error: passing argument 1 of 'pmd_offset' from incompatible pointer type [-Werror=incompatible-pointer-types] > > > arch/m68k/mm/kmap.c:80:28: error: 'pmd_t {aka struct }' has no member named 'pmd'; did you mean 'pud'? > > Mike's changes to __iounmap() should be applied to __free_io_area() now, > due to hch's move/rename of the function. > > > Thanks - a messed up merge fix, I guess. Mike, can you please check? > > I've attached an incremental fix, compile-tested only. I was just about to send the same fix :) It boots on aranym. > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds > From 619eab7044ec1f43d761c95fd62f50be2e5deb63 Mon Sep 17 00:00:00 2001 > From: Geert Uytterhoeven > Date: Tue, 26 Nov 2019 09:06:43 +0100 > Subject: [PATCH] > m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix-fix.patch > > more merge glitch fixes. > > Signed-off-by: Geert Uytterhoeven > --- > arch/m68k/mm/kmap.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c > index 06aa0ccc1f1aeca7..2bc570c14c3525dc 100644 > --- a/arch/m68k/mm/kmap.c > +++ b/arch/m68k/mm/kmap.c > @@ -63,18 +63,23 @@ static void __free_io_area(void *addr, unsigned long size) > { > unsigned long virtaddr = (unsigned long)addr; > pgd_t *pgd_dir; > + p4d_t *p4d_dir; > + pud_t *pud_dir; > pmd_t *pmd_dir; > pte_t *pte_dir; > > while ((long)size > 0) { > pgd_dir = pgd_offset_k(virtaddr); > - if (pgd_bad(*pgd_dir)) { > - printk("iounmap: bad pgd(%08lx)\n", pgd_val(*pgd_dir)); > - pgd_clear(pgd_dir); > + p4d_dir = p4d_offset(pgd_dir, virtaddr); > + pud_dir = pud_offset(p4d_dir, virtaddr); > + if (pud_bad(*pud_dir)) { > + printk("iounmap: bad pgd(%08lx)\n", pud_val(*pud_dir)); ^ bad pud ;-) > + pud_clear(pud_dir); > return; > } > - pmd_dir = pmd_offset(pgd_dir, virtaddr); > + pmd_dir = pmd_offset(pud_dir, virtaddr); > > +#if CONFIG_PGTABLE_LEVELS == 3 > if (CPU_IS_020_OR_030) { > int pmd_off = (virtaddr/PTRTREESIZE) & 15; > int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK; > @@ -87,6 +92,7 @@ static void __free_io_area(void *addr, unsigned long size) > } else if (pmd_type == 0) > continue; > } > +#endif > > if (pmd_bad(*pmd_dir)) { > printk("iounmap: bad pmd (%08lx)\n", pmd_val(*pmd_dir)); > @@ -314,6 +320,8 @@ void kernel_set_cachemode(void *addr, unsigned long size, int cmode) > { > unsigned long virtaddr = (unsigned long)addr; > pgd_t *pgd_dir; > + p4d_t *p4d_dir; > + pud_t *pud_dir; > pmd_t *pmd_dir; > pte_t *pte_dir; > > -- > 2.17.1 > -- Sincerely yours, Mike.