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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 3C5FFC43460 for ; Fri, 30 Apr 2021 11:28:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8AF736024A for ; Fri, 30 Apr 2021 11:28:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AF736024A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cs.pub.ro Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.120473.227850 (Exim 4.92) (envelope-from ) id 1lcRJu-00015K-9E; Fri, 30 Apr 2021 11:28:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 120473.227850; Fri, 30 Apr 2021 11:28:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lcRJu-00015C-5N; Fri, 30 Apr 2021 11:28:30 +0000 Received: by outflank-mailman (input) for mailman id 120473; Fri, 30 Apr 2021 11:28:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lcRJs-00011a-Eb for xen-devel@lists.xenproject.org; Fri, 30 Apr 2021 11:28:28 +0000 Received: from mx.upb.ro (unknown [141.85.13.220]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 98151aa8-f33c-439a-9db7-ab35e1e21fc7; Fri, 30 Apr 2021 11:28:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id DCDBAB560113; Fri, 30 Apr 2021 14:28:20 +0300 (EEST) Received: from mx.upb.ro ([127.0.0.1]) by localhost (mx.upb.ro [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id jgHZByzHpTZ1; Fri, 30 Apr 2021 14:28:18 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id 735A9B5600B0; Fri, 30 Apr 2021 14:28:18 +0300 (EEST) Received: from mx.upb.ro ([127.0.0.1]) by localhost (mx.upb.ro [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Bok4qv--nPKH; Fri, 30 Apr 2021 14:28:18 +0300 (EEST) Received: from localhost.localdomain (unknown [188.25.174.245]) by mx.upb.ro (Postfix) with ESMTPSA id B1651B56010D; Fri, 30 Apr 2021 14:28:17 +0300 (EEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 98151aa8-f33c-439a-9db7-ab35e1e21fc7 X-Virus-Scanned: amavisd-new at upb.ro From: Costin Lupu To: xen-devel@lists.xenproject.org Cc: Tim Deegan , Ian Jackson , Wei Liu Subject: [PATCH v2 1/5] tools/debugger: Fix PAGE_SIZE redefinition error Date: Fri, 30 Apr 2021 14:28:07 +0300 Message-Id: <26c90f29058c8f2cf36230eee4f4e3ebd097a04d.1619781564.git.costin.lupu@cs.pub.ro> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable If PAGE_SIZE is already defined in the system (e.g. in /usr/include/limit= s.h header) then gcc will trigger a redefinition error because of -Werror. Th= is patch replaces usage of PAGE_* macros with XC_PAGE_* macros in order to a= void confusion between control domain page granularity (PAGE_* definitions) an= d guest domain page granularity (which is what we are dealing with here). Signed-off-by: Costin Lupu --- tools/debugger/kdd/kdd-xen.c | 15 ++++++--------- tools/debugger/kdd/kdd.c | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/tools/debugger/kdd/kdd-xen.c b/tools/debugger/kdd/kdd-xen.c index f3f9529f9f..d6308929e8 100644 --- a/tools/debugger/kdd/kdd-xen.c +++ b/tools/debugger/kdd/kdd-xen.c @@ -48,9 +48,6 @@ =20 #define MAPSIZE 4093 /* Prime */ =20 -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1U << PAGE_SHIFT) - struct kdd_guest { struct xentoollog_logger xc_log; /* Must be first for xc log callbac= ks */ xc_interface *xc_handle; @@ -72,7 +69,7 @@ static void flush_maps(kdd_guest *g) int i; for (i =3D 0; i < MAPSIZE; i++) { if (g->maps[i] !=3D NULL) - munmap(g->maps[i], PAGE_SIZE); + munmap(g->maps[i], XC_PAGE_SIZE); g->maps[i] =3D NULL; } } @@ -490,13 +487,13 @@ static uint32_t kdd_access_physical_page(kdd_guest = *g, uint64_t addr, uint32_t map_pfn, map_offset; uint8_t *map; =20 - map_pfn =3D (addr >> PAGE_SHIFT); - map_offset =3D addr & (PAGE_SIZE - 1); + map_pfn =3D (addr >> XC_PAGE_SHIFT); + map_offset =3D addr & (XC_PAGE_SIZE - 1); =20 /* Evict any mapping of the wrong frame from our slot */=20 if (g->pfns[map_pfn % MAPSIZE] !=3D map_pfn && g->maps[map_pfn % MAPSIZE] !=3D NULL) { - munmap(g->maps[map_pfn % MAPSIZE], PAGE_SIZE); + munmap(g->maps[map_pfn % MAPSIZE], XC_PAGE_SIZE); g->maps[map_pfn % MAPSIZE] =3D NULL; } g->pfns[map_pfn % MAPSIZE] =3D map_pfn; @@ -507,7 +504,7 @@ static uint32_t kdd_access_physical_page(kdd_guest *g= , uint64_t addr, else { map =3D xc_map_foreign_range(g->xc_handle, g->domid, - PAGE_SIZE, + XC_PAGE_SIZE, PROT_READ|PROT_WRITE, map_pfn); =20 @@ -533,7 +530,7 @@ uint32_t kdd_access_physical(kdd_guest *g, uint64_t a= ddr, { uint32_t chunk, rv, done =3D 0; while (len > 0) { - chunk =3D PAGE_SIZE - (addr & (PAGE_SIZE - 1)); + chunk =3D XC_PAGE_SIZE - (addr & (XC_PAGE_SIZE - 1)); if (chunk > len)=20 chunk =3D len; rv =3D kdd_access_physical_page(g, addr, chunk, buf, write); diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c index 17513c2650..fa23948242 100644 --- a/tools/debugger/kdd/kdd.c +++ b/tools/debugger/kdd/kdd.c @@ -50,6 +50,8 @@ #include #include =20 +#include + #include "kdd.h" =20 /* @@ -288,9 +290,6 @@ static void kdd_log_pkt(kdd_state *s, const char *nam= e, kdd_pkt *p) * Memory access: virtual addresses and syntactic sugar. */ =20 -#define PAGE_SHIFT (12) -#define PAGE_SIZE (1ULL << PAGE_SHIFT)=20 - static uint32_t kdd_read_physical(kdd_state *s, uint64_t addr,=20 uint32_t len, void *buf) { @@ -352,7 +351,7 @@ static uint64_t v2p(kdd_state *s, int cpuid, uint64_t= va) =20 /* Walk the appropriate number of levels */ for (i =3D levels; i > 0; i--) { - shift =3D PAGE_SHIFT + bits * (i-1); + shift =3D XC_PAGE_SHIFT + bits * (i-1); mask =3D ((1ULL << bits) - 1) << shift; offset =3D ((va & mask) >> shift) * width; KDD_DEBUG(s, "level %i: mask 0x%16.16"PRIx64" pa 0x%16.16"PRIx64 @@ -364,12 +363,12 @@ static uint64_t v2p(kdd_state *s, int cpuid, uint64= _t va) return -1ULL; // Not present pa =3D entry & 0x000ffffffffff000ULL; if (pse && (i =3D=3D 2) && (entry & 0x80)) { // Superpage - mask =3D ((1ULL << (PAGE_SHIFT + bits)) - 1); + mask =3D ((1ULL << (XC_PAGE_SHIFT + bits)) - 1); return (pa & ~mask) + (va & mask); } } =20 - return pa + (va & (PAGE_SIZE - 1)); + return pa + (va & (XC_PAGE_SIZE - 1)); } =20 static uint32_t kdd_access_virtual(kdd_state *s, int cpuid, uint64_t add= r, @@ -380,7 +379,7 @@ static uint32_t kdd_access_virtual(kdd_state *s, int = cpuid, uint64_t addr, =20 /* Process one page at a time */ while (len > 0) { - chunk =3D PAGE_SIZE - (addr & (PAGE_SIZE - 1)); + chunk =3D XC_PAGE_SIZE - (addr & (XC_PAGE_SIZE - 1)); if (chunk > len)=20 chunk =3D len; pa =3D v2p(s, cpuid, addr); @@ -591,7 +590,7 @@ static void get_os_info_64(kdd_state *s) uint64_t dbgkd_addr; DBGKD_GET_VERSION64 dbgkd_get_version64; /* Maybe 1GB is too big for the limit to search? */ - uint32_t search_limit =3D (1024 * 1024 * 1024) / PAGE_SIZE; /*1GB/Pa= geSize*/ + uint32_t search_limit =3D (1024 * 1024 * 1024) / XC_PAGE_SIZE; /*1GB= /PageSize*/ uint64_t efer; =20 /* if we are not in 64-bit mode, fail */ @@ -620,7 +619,7 @@ static void get_os_info_64(kdd_state *s) * in 1GB range above the current page base address */ =20 - base =3D idt0_addr & ~(PAGE_SIZE - 1); + base =3D idt0_addr & ~(XC_PAGE_SIZE - 1); =20 while (search_limit) { uint16_t val; @@ -633,7 +632,7 @@ static void get_os_info_64(kdd_state *s) if (val =3D=3D MZ_HEADER) // MZ break; =20 - base -=3D PAGE_SIZE; + base -=3D XC_PAGE_SIZE; search_limit -=3D 1; } =20 @@ -720,7 +719,7 @@ static void find_os(kdd_state *s) /* Try each page in the potential range of kernel load addresses= */ for (limit =3D s->os.base + s->os.range; s->os.base <=3D limit; - s->os.base +=3D PAGE_SIZE) + s->os.base +=3D XC_PAGE_SIZE) if (check_os(s)) return; } --=20 2.20.1