From owner-freebsd-current@freebsd.org Sun Nov 20 03:32:49 2016 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56502C3E235; Sun, 20 Nov 2016 03:32:49 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-ua0-x244.google.com (mail-ua0-x244.google.com [IPv6:2607:f8b0:400c:c08::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B39A1B66; Sun, 20 Nov 2016 03:32:49 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-ua0-x244.google.com with SMTP id b35so21986677uaa.1; Sat, 19 Nov 2016 19:32:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=qNKNmklHlKbaCmehOfmM3JPjpN2lrAeph0Ex76VSFkY=; b=uRFFIaa2t8txV0b5eYyQ2JYLdgpXGVzxosoUhrMi3vri99HiHB1RQc1EoP2/HJtEWH nE0GXYADhesb5wTaT+fJ/uIdlaWjh3HBNx4+IxpHUNPDq4j4E/IgU8i/D8vHixynEF9G 2afEhD8sc4BVmUVI6J1hkgfO1aEPCGFP+on5I4q2tCMCEmvQ5fLmmuT/VEG9LBNVY6g4 s99htDPLxKWN1XUpJdEa1vmNMtAnoEhdReX342occHk5RjBG8J2BXHnDGyl3myVJoBbv Yn1mSI6495aFw9gDtYwqJZKWMIoSHvHWLwmtTvUQQqoqc3VwFhEJUtA1PZpvWm42f8/b YcRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=qNKNmklHlKbaCmehOfmM3JPjpN2lrAeph0Ex76VSFkY=; b=Mq++jj9iJljq2uN5h9RwwAPJ7e8pVhgs2tIGPyp4ta1Pot4knTOV/U6iTwkXuO9MVg 1nfq2sQeB0wnWWYISH6XoiHOTSKaCDT0vHo+zHdlJvk9UFNKY2CZxsMi31pVkLTfVsvG njtmEB28qWh2UpVsIXq5tXSYMzl/M7CRMJzNsD0yv0TxP9SB0sdpdnVb2Y1iutjTEHz7 qmTwvkvkPPGjFbuyHDWibDiwlCEroErBRR7Pl1uG/nn5cOP5XbRi59LlNB4vlFhh8y5T /LqFsV3zYPBzI+z0GpYjQ4GGXehj539hE8l6agcpg0nU3vpVuScuaOXO4rPlYTMjrKxZ EKFg== X-Gm-Message-State: AKaTC01KsY8yoSpC1ZywiZdBR/Cz+RaGPpIM3fOvHd5ugnyk/RlfC2LMvezLyIxdSTBDuD3dyVL9V7W1vFUF5Q== X-Received: by 10.176.80.46 with SMTP id b43mr3978132uaa.135.1479612768097; Sat, 19 Nov 2016 19:32:48 -0800 (PST) MIME-Version: 1.0 Sender: chmeeedalf@gmail.com Received: by 10.103.150.66 with HTTP; Sat, 19 Nov 2016 19:32:47 -0800 (PST) Received: by 10.103.150.66 with HTTP; Sat, 19 Nov 2016 19:32:47 -0800 (PST) In-Reply-To: <3D338DB4-9FAF-46A8-96FF-4F77B01871E2@dsl-only.net> References: <39962D4C-29BA-4AA4-B77D-2344A68FDB54@dsl-only.net> <53258F35-C86E-4DE0-BDF0-5C139E68356D@dsl-only.net> <20161119204715.79632a66@zhabar.knownspace> <3D338DB4-9FAF-46A8-96FF-4F77B01871E2@dsl-only.net> From: Justin Hibbits Date: Sat, 19 Nov 2016 21:32:47 -0600 X-Google-Sender-Auth: hJUhpIz5GPzFTX-rTAHWerZAWTc Message-ID: Subject: Re: svn commit: r308817 - head/sys/powerpc/include [Still have pmap_t and struct pmap ppowerpc64 problems as of -r308860] To: Mark Millard Cc: svn-src-head@freebsd.org, FreeBSD Current Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2016 03:32:49 -0000 Sorry, I generated the diff from a different tree that wasn't synced to head (had the same change in both trees originally). If that is the only problem, you can ignore it and try the rest. I can generate another diff later too. - Justin On Nov 19, 2016 21:27, "Mark Millard" wrote: > [Top post about patch issues.] > > Looking at the patch it seems to be designed for when #else was in use: > > > -#else > > +#elif defined(BOOKE) > > but -r308817 already has the 2nd line (BOOKE). Your patch shows: > > > Index: sys/powerpc/include/pmap.h > > =================================================================== > > --- sys/powerpc/include/pmap.h (revision 308718) > > +++ sys/powerpc/include/pmap.h (working copy) > > So it looks like you started from before -r308817 . > > Trying it (I'm at -r308860): > > > Patching file sys/powerpc/include/pmap.h using Plan A... > > Hunk #1 succeeded at 74. > > Hunk #2 succeeded at 84. > > Hunk #3 succeeded at 132. > > Hunk #4 succeeded at 145. > > Hunk #5 failed at 180. > > Hunk #6 succeeded at 194. > > Hunk #7 succeeded at 210. > > 1 out of 7 hunks failed--saving rejects to sys/powerpc/include/pmap.h.rej > > > # more sys/powerpc/include/pmap.h.rej > > @@ -179,13 +180,13 @@ > > struct slb **slb_alloc_user_cache(void); > > void slb_free_user_cache(struct slb **); > > > > -#else > > +#elif defined(BOOKE) > > > > struct pmap { > > + struct pmap_statistics pm_stats; /* pmap statistics */ > > struct mtx pm_mtx; /* pmap mutex */ > > tlbtid_t pm_tid[MAXCPU]; /* TID to identify this > pmap entries in TLB */ > > cpuset_t pm_active; /* active on cpus */ > > - struct pmap_statistics pm_stats; /* pmap statistics */ > > > > /* Page table directory, array of pointers to page tables. */ > > pte_t *pm_pdir[PDIR_NENTRIES]; > > > === > Mark Millard > markmi at dsl-only.net > > On 2016-Nov-19, at 7:00 PM, Mark Millard wrote: > > It may take a little bit but I'll try the patch. > > It looks like sys/powerpc/include/pmap.h from -r176700 from 2088-Mar-3 > is when the BOOKE/E500 split started with the preprocessor use of AIM > and #else . This predates PowerMac G5 support. > > This is definitely not new for the general structure on the powerpc > side of things. Any place that did not have the AIM vs. not status > available was subject to problems of possibly mismatched definitions. > > === > Mark Millard > markmi at dsl-only.net > > On 2016-Nov-19, at 6:47 PM, Justin Hibbits > wrote: > > On Sat, 19 Nov 2016 18:36:39 -0800 > Mark Millard wrote: > > > [Quick top post I'm afraid.] > > > > I think that I figured out why there is a problem even earlier > > --that just did not stop the compiles. > > > > lib/libutil/kinfo_getallproc.c is built here as part of buildworld > > (stage 4.2 "building libraries" instead of buildkernel. It does not > > have the KERNCONF's AIM vs. BOOKE vs. . . . definitions vs. lack of > > them). > > > > So if it includes machine/pmap.h that binds to > > sys/powerpc/include/pmap.h which has the structure. . . > > > > . . . > > #if defined(AIM) > > . . . (definitions here) > > #elif defined(BOOKE) > > . . . (definitions here) > > #endif > > . . . > > > > it gets no definition now. > > > > With the older: > > > > . . . > > #if defined(AIM) > > . . . (definitions here) > > #else > > . . . (definitions here) > > #endif > > . . . > > > > It got a definition, just not necessarily the right one. > > > > > > === > > Mark Millard > > markmi at dsl-only.net > > Can you try the attached patch? There was a subtle ABI issue that > r308817 exposed, which is that the pmap structs aren't identical such > that the pm_stats are at different locations, and libkvm ends up > reading with the Book-E pmap, getting different stats than expected for > AIM. This patch fixes that, bumping version to account for this ABI > change. > > - Justin > > >