From patchwork Fri May 10 15:11:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 16860 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BD0F225D5C for ; Fri, 10 May 2013 15:12:53 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id d1sf5011404qcz.0 for ; Fri, 10 May 2013 08:12:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=9//FjbGlWULYfCd1PgF1uh2L9Zm7W27MPiywDdVY7JA=; b=PMp1rDDPB17LsOH00ehzB6vY0kskEhhOoHu+1E4MHH2tyw3PLSfbUP6gccWh2QOmpB xh9ohtd46zBzny0xzAJrtVNkpStg2FnhpnQghoXGC//XM7N8EQPjtuq6SQeWVaLvAWQu kPaWPsvtLLsOmMptr5KR8tD1aizZw3qXBABGjIVR6SoOMz/PsUIGbnYdfSDWQ4iotgYG Ku7DuyU9/Nl5Wwn2Y9vbkdb67xeWrwlyyQqCTKqTN8ZHB6i360IHvorelZC8BUn/5hXu m6qV8OjrF3EnJJekcwj/oponKf0a7HGx1/RttLH3/BLytDop9DDD3/A1Q+JtllUxuPS5 ITIA== X-Received: by 10.224.215.194 with SMTP id hf2mr12319536qab.0.1368198747887; Fri, 10 May 2013 08:12:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.36.9 with SMTP id m9ls1798497qej.55.gmail; Fri, 10 May 2013 08:12:27 -0700 (PDT) X-Received: by 10.52.19.45 with SMTP id b13mr9726618vde.83.1368198747676; Fri, 10 May 2013 08:12:27 -0700 (PDT) Received: from mail-ve0-x22d.google.com (mail-ve0-x22d.google.com [2607:f8b0:400c:c01::22d]) by mx.google.com with ESMTPS id e9si1474611vcp.57.2013.05.10.08.12.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 May 2013 08:12:27 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22d; Received: by mail-ve0-f173.google.com with SMTP id cy12so555892veb.32 for ; Fri, 10 May 2013 08:12:27 -0700 (PDT) X-Received: by 10.52.175.200 with SMTP id cc8mr9729868vdc.94.1368198747549; Fri, 10 May 2013 08:12:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.217.15 with SMTP id hk15csp59254vcb; Fri, 10 May 2013 08:12:27 -0700 (PDT) X-Received: by 10.194.243.10 with SMTP id wu10mr8029435wjc.13.1368198746512; Fri, 10 May 2013 08:12:26 -0700 (PDT) Received: from mail-we0-x22a.google.com (mail-we0-x22a.google.com [2a00:1450:400c:c03::22a]) by mx.google.com with ESMTPS id en20si790822wic.64.2013.05.10.08.12.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 May 2013 08:12:26 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22a is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=2a00:1450:400c:c03::22a; Received: by mail-we0-f170.google.com with SMTP id u54so4191546wes.29 for ; Fri, 10 May 2013 08:12:26 -0700 (PDT) X-Received: by 10.194.109.103 with SMTP id hr7mr20139557wjb.0.1368198745905; Fri, 10 May 2013 08:12:25 -0700 (PDT) Received: from belegaer.uk.xensource.com. (firewall.ctxuk.citrix.com. [46.33.159.2]) by mx.google.com with ESMTPSA id e8sm4080359wic.5.2013.05.10.08.12.24 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 May 2013 08:12:25 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: Stefano.Stabellini@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org, Julien Grall , keir@xen.org Subject: [PATCH V4 02/32] xen/mm: Align virtual address on PAGE_SIZE in iounmap Date: Fri, 10 May 2013 16:11:54 +0100 Message-Id: <1368198723-24639-3-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368198723-24639-1-git-send-email-julien.grall@linaro.org> References: <1368198723-24639-1-git-send-email-julien.grall@linaro.org> X-Gm-Message-State: ALoCoQkhS6SPllp2Ign1MzFrhaaleGSIfhXK8SKz7BclD9gX2GspDMuzcPLcEJUhRQ306aSe1sI7 X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ioremap function can unlikely return an unaligned virtual address if the physical address itself is unaligned on a page size. Signed-off-by: Julien Grall Acked-by: Jan Beulich CC: keir@xen.org Changes in v4: - replace vaddr_t by unsigned int --- xen/include/xen/vmap.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 88e5d99..45e9870 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -15,7 +15,9 @@ void __iomem *ioremap(paddr_t, size_t); static inline void iounmap(void __iomem *va) { - vunmap((void __force *)va); + unsigned int addr = (unsigned int)(void __force *)va; + + vunmap((void *)(addr & PAGE_MASK)); } void vm_init(void);