From patchwork Mon Jun 6 16:26:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 99013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A7123B6FA3 for ; Tue, 7 Jun 2011 05:27:52 +1000 (EST) Received: from localhost ([::1]:34997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTfSm-0000Lg-0V for incoming@patchwork.ozlabs.org; Mon, 06 Jun 2011 15:27:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTceD-0003zi-F8 for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTceA-0003vd-U2 for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:25 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:37089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTceA-0003uL-Gu for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:22 -0400 Received: by mail-pz0-f45.google.com with SMTP id 30so2120606pzk.4 for ; Mon, 06 Jun 2011 09:27:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=NX8vDDLDbM32T5s47rTt8hnZGXi3b+gkGj+qUH+99DE=; b=AuZSqOOnv9Ca76W71Sj7dh7DQ5a+anaAQdu5bU+4gbOt28gO2/O95Am/hpqRShZQ6+ 0tIc1GP/qPq+E5o90kUjpAUrDgRWRy6aTy6xofeVHyBZ8EHVky+59yCITbLfUFh3r+HC Z6ugC1XBdQRXHR0qIU1ENh7m3kv2bGCzYwSSE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=De4RVSaJ7tSTwZJOLZgEptDmUhShCU2Rl1dEw5T39rKVj150cLcqJ9dE/PD8z745cv 5szjUmfmFH+MEUS1jW60GmfDrBj6hRZciFGizrRHr1HcOKHULJ2/kP0eBTbFnPqAq0gD RgDkby9zESJjZXZVk1WQBc4VRuz1GBAZnH7LI= Received: by 10.68.3.139 with SMTP id c11mr1942139pbc.277.1307377642111; Mon, 06 Jun 2011 09:27:22 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id y2sm3785829pbi.51.2011.06.06.09.27.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Jun 2011 09:27:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2011 18:26:54 +0200 Message-Id: <1307377620-7538-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307377620-7538-1-git-send-email-pbonzini@redhat.com> References: <1307377620-7538-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [RFC PATCH 3/9] pvscsi: check validity of DMA addresses in advance X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This also depends on the cpu_physical_memory_map_fast series, so I'm keeping it separated. Signed-off-by: Paolo Bonzini --- hw/vmw_pvscsi.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/hw/vmw_pvscsi.c b/hw/vmw_pvscsi.c index 6f0b0b9..84bcfe6 100644 --- a/hw/vmw_pvscsi.c +++ b/hw/vmw_pvscsi.c @@ -383,6 +383,35 @@ static void pvscsi_transfer_data_with_sg_list(PVSCSIRequest *p, bool to_host, } } +static bool pvscsi_check_sg_list_addresses(PVSCSIRequest *p) +{ + uint64_t len = p->req.dataLen; + uint64_t n; + PVSCSISGState sg = { .elemAddr = p->req.dataAddr }; + while (len) { + while (!sg.resid) { + pvscsi_get_next_sg_elem(&sg); + } + n = MIN(len, sg.resid); + if (!cpu_physical_memory_map_check(sg.dataAddr, n)) { + return false; + } + + len -= n; + sg.resid -= n; + } + return true; +} + +static bool pvscsi_check_addresses(PVSCSIRequest *p) +{ + if (p->req.flags & PVSCSI_FLAG_CMD_WITH_SG_LIST) { + return pvscsi_check_sg_list_addresses(p); + } else { + return cpu_physical_memory_map_check(p->req.dataAddr, p->req.dataLen); + } +} + /* Callback to indicate that the SCSI layer has completed a transfer. */ static void pvscsi_transfer_data(SCSIRequest *req, uint32_t len) { @@ -487,6 +516,12 @@ static void pvscsi_process_req(PVSCSIState *s, struct PVSCSIRingReqDesc *r) return; } + if (!pvscsi_check_addresses(p)) { + p->cmp.hostStatus = BTSTAT_DATARUN; + pvscsi_complete_req(s, p); + return; + } + if (r->flags & PVSCSI_FLAG_CMD_WITH_SG_LIST) { p->sg.elemAddr = r->dataAddr; }