From patchwork Mon May 11 11:55:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 48274 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C0A4A2121F for ; Mon, 11 May 2015 11:58:13 +0000 (UTC) Received: by wizk4 with SMTP id k4sf25193048wiz.2 for ; Mon, 11 May 2015 04:58:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=Z66MwWkcY1G7aUIseZgjFKhoSTxIzqdk2X97aQHDx9g=; b=YMMcCq0NuGeh/dCSWxf3WiqYRV6rbDOOOMZkcMhloase8YqdoceKbaCk0zTALitBPD iNuVMghFK1u9AxalmFQ8SjfGjWrdC6uuXxUgB3oMxjyazhqaYZCe/TWDaOyJbfEYaVp7 m+9pP41U6Dm3EfxMvxEaIIj+2wFXg6vniTKEy6QMj86a/lemXQDde/qof9CYloop9+j9 Pen3z1z7Pymi/6sv00q2ViveON0EnprUEFAugAKjMB5Ut3IhFGDIVH72mCYCy/B9yzI9 drc9ufp4YgHCkfZuuj+TdUckb6tcdKIFeWuRk57TYCNBZC6cCalrhyyX/UYaSXYyrBWO NgIQ== X-Gm-Message-State: ALoCoQk/92xoDuoAroLtSHLk9GwzZ9Scw1bdtBL3+XiXFM6ezfCSlOKX/Z1bMmWOzQYyAyIXp2NM X-Received: by 10.112.13.200 with SMTP id j8mr7383559lbc.14.1431345493024; Mon, 11 May 2015 04:58:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.232 with SMTP id p8ls629577laf.13.gmail; Mon, 11 May 2015 04:58:12 -0700 (PDT) X-Received: by 10.152.164.233 with SMTP id yt9mr3744214lab.58.1431345492914; Mon, 11 May 2015 04:58:12 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id f4si8242913lbv.47.2015.05.11.04.58.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 04:58:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbzk7 with SMTP id zk7so92022186lbb.0 for ; Mon, 11 May 2015 04:58:12 -0700 (PDT) X-Received: by 10.112.204.104 with SMTP id kx8mr7683970lbc.72.1431345492786; Mon, 11 May 2015 04:58:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1461041lbb; Mon, 11 May 2015 04:58:12 -0700 (PDT) X-Received: by 10.229.174.202 with SMTP id u10mr13311386qcz.4.1431345491100; Mon, 11 May 2015 04:58:11 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id m46si12727470qgd.70.2015.05.11.04.58.10 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 May 2015 04:58:11 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YrmK0-0000Kz-N2; Mon, 11 May 2015 11:56:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YrmJz-0000JM-Oy for xen-devel@lists.xenproject.org; Mon, 11 May 2015 11:56:31 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 58/C2-03201-EE890555; Mon, 11 May 2015 11:56:30 +0000 X-Env-Sender: julien.grall@citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1431345387!14168471!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15425 invoked from network); 11 May 2015 11:56:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 11 May 2015 11:56:29 -0000 X-IronPort-AV: E=Sophos;i="5.13,406,1427760000"; d="scan'208";a="263708225" From: Julien Grall To: Date: Mon, 11 May 2015 12:55:35 +0100 Message-ID: <1431345336-5476-2-git-send-email-julien.grall@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1431345336-5476-1-git-send-email-julien.grall@citrix.com> References: <1431345336-5476-1-git-send-email-julien.grall@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, tim@xen.org, Julien Grall , ian.jackson@eu.citrix.com, Julien Grall , stefano.stabellini@citrix.com Subject: [Xen-devel] [PATCH 1/2] tools/xenstored: Use XC_PAGE_SIZE rather than getpagesize() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: From: Julien Grall Linux may not use the same page granularity as Xen. This will result to a domain crash because it will try to map more page than required. As the xenstore page size willl always be equal to a Xen page size, use XC_PAGE_SIZE. Signed-off-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 6d0394d..0776e39 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -172,7 +172,7 @@ static void *map_interface(domid_t domid, unsigned long mfn) GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); } else { return xc_map_foreign_range(*xc_handle, domid, - getpagesize(), PROT_READ|PROT_WRITE, mfn); + XC_PAGE_SIZE, PROT_READ|PROT_WRITE, mfn); } } @@ -181,7 +181,7 @@ static void unmap_interface(void *interface) if (*xcg_handle != NULL) xc_gnttab_munmap(*xcg_handle, interface, 1); else - munmap(interface, getpagesize()); + munmap(interface, XC_PAGE_SIZE); } static int destroy_domain(void *_domain)