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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 BC59BC54FCB for ; Wed, 22 Apr 2020 13:08:11 +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 939F3206EC for ; Wed, 22 Apr 2020 13:08:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 939F3206EC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRF6f-0001i9-1z; Wed, 22 Apr 2020 13:08:01 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRF6d-0001hx-1b for xen-devel@lists.xenproject.org; Wed, 22 Apr 2020 13:07:59 +0000 X-Inumbo-ID: 4968f0de-849a-11ea-83d8-bc764e2007e4 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4968f0de-849a-11ea-83d8-bc764e2007e4; Wed, 22 Apr 2020 13:07:58 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7FB5DABEC; Wed, 22 Apr 2020 13:07:56 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Subject: [PATCH] xen/grants: fix hypercall continuation for GNTTABOP_cache_flush Date: Wed, 22 Apr 2020 15:07:53 +0200 Message-Id: <20200422130753.14713-1-jgross@suse.com> X-Mailer: git-send-email 2.16.4 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Julien Grall , Wei Liu , Andrew Cooper , Ian Jackson , George Dunlap , Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The GNTTABOP_cache_flush hypercall has a wrong test for hypercall continuation, the test today is: if ( rc > 0 || opaque_out != 0 ) Unfortunately this will be true even in case of an error (rc < 0), possibly leading to very long lasting hypercalls (times of more than an hour have been observed in a test case). Correct the test condition to result in false with rc < 0 and set opaque_out only if no error occurred, to be on the safe side. Partially-suggested-by: Jan Beulich Signed-off-by: Juergen Gross --- xen/common/grant_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 96080b3dec..5ef7ff940d 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3626,12 +3626,12 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(cflush, count)) ) goto out; rc = gnttab_cache_flush(cflush, &opaque_in, count); - if ( rc > 0 ) + if ( rc >= 0 ) { guest_handle_add_offset(cflush, rc); uop = guest_handle_cast(cflush, void); + opaque_out = opaque_in; } - opaque_out = opaque_in; break; } @@ -3641,7 +3641,7 @@ do_grant_table_op( } out: - if ( rc > 0 || opaque_out != 0 ) + if ( rc > 0 || (opaque_out != 0 && rc == 0) ) { /* Adjust rc, see gnttab_copy() for why this is needed. */ if ( cmd == GNTTABOP_copy ) -- 2.16.4