Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754140AbZFMEVP (ORCPT ); Sat, 13 Jun 2009 00:21:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751054AbZFMEVF (ORCPT ); Sat, 13 Jun 2009 00:21:05 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:40169 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751001AbZFMEVE (ORCPT ); Sat, 13 Jun 2009 00:21:04 -0400 To: Amerigo Wang Cc: Tao Ma , Andrew Morton , linux-kernel@vger.kernel.org, Alexey Dobriyan References: <4A2A7F33.4030807@oracle.com> <4A2AEBE3.4000100@kernel.org> <20090608015242.GB2596@cr0.nay.redhat.com> <4A2CA96D.3090502@oracle.com> <2375c9f90906072341o2cded749m45bdddfdb499469@mail.gmail.com> <4A2CC52B.9010602@oracle.com> <2375c9f90906081743p77934f47n8ba1a018d333b95b@mail.gmail.com> <20090611050929.GA2706@cr0.nay.redhat.com> <20090613040958.GA2959@cr0> From: ebiederm@xmission.com (Eric W. Biederman) Date: Fri, 12 Jun 2009 21:20:50 -0700 In-Reply-To: <20090613040958.GA2959@cr0> (Amerigo Wang's message of "Sat\, 13 Jun 2009 12\:09\:58 +0800") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-XM-SPF: eid=;;;mid=;;;hst=in01.mta.xmission.com;;;ip=76.21.114.89;;;frm=ebiederm@xmission.com;;;spf=neutral X-SA-Exim-Connect-IP: 76.21.114.89 X-SA-Exim-Rcpt-To: xiyou.wangcong@gmail.com, adobriyan@gmail.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, tao.ma@oracle.com X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-DCC: XMission; sa04 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Amerigo Wang X-Spam-Relay-Country: X-Spam-Report: * -1.8 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 T_TM2_M_HEADER_IN_MSG BODY: T_TM2_M_HEADER_IN_MSG * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% * [score: 0.0000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; Body=1 Fuz1=1 Fuz2=1] * 0.5 XM_Body_Dirty_Words Contains a dirty word * 0.0 XM_SPF_Neutral SPF-Neutral * 0.4 UNTRUSTED_Relay Comes from a non-trusted relay Subject: Re: [Patch BUGFIX] kcore: fix its wrong size on x86_64 X-SA-Exim-Version: 4.2.1 (built Thu, 25 Oct 2007 00:26:12 +0000) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1809 Lines: 52 Amerigo Wang writes: > Fix wrong /proc/kcore size on x86_64. How does that change anything? > x86_64 uses __va() macro to caculate the virtual address passed to kclist_add() > but decodes it with its own macro kc_vadd_to_offset(). This is wrong. > > Also, according to Documentation/x86/x86_64/mm.txt, kc_vaddr_to_offset() > is wrong too. > > So just remove them, use the generic macro. > > BTW, the man page for /proc/kcore is wrong, its size can be more than > the physical memory size, because it also contains memory area of > vmalloc(), vsyscall etc... The set of offsets that are usable sure. However the size from stat is: proc_root_kcore->size = (size_t)high_memory - PAGE_OFFSET + PAGE_SIZE; Which can not be different than the physical memory size. > Reported-by: Tao Ma > Signed-off-by: WANG Cong > Cc: Eric W. Biederman > > --- > diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h > index abde308..cdbfd1d 100644 > --- a/arch/x86/include/asm/pgtable_64.h > +++ b/arch/x86/include/asm/pgtable_64.h > @@ -163,12 +163,6 @@ extern void cleanup_highmap(void); > #define PAGE_AGP PAGE_KERNEL_NOCACHE > #define HAVE_PAGE_AGP 1 > > -/* fs/proc/kcore.c */ > -#define kc_vaddr_to_offset(v) ((v) & __VIRTUAL_MASK) > -#define kc_offset_to_vaddr(o) \ > - (((o) & (1UL << (__VIRTUAL_MASK_SHIFT - 1))) \ > - ? ((o) | ~__VIRTUAL_MASK) \ > - : (o)) > > #define __HAVE_ARCH_PTE_SAME > #endif /* !__ASSEMBLY__ */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/