From patchwork Mon Oct 30 02:56:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10031903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 49D70603B5 for ; Mon, 30 Oct 2017 02:56:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35FA928716 for ; Mon, 30 Oct 2017 02:56:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2AEC22871D; Mon, 30 Oct 2017 02:56:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A25ED28716 for ; Mon, 30 Oct 2017 02:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752125AbdJ3C40 (ORCPT ); Sun, 29 Oct 2017 22:56:26 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:45339 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbdJ3C4Q (ORCPT ); Sun, 29 Oct 2017 22:56:16 -0400 Received: by mail-wm0-f65.google.com with SMTP id y80so6109696wmd.0 for ; Sun, 29 Oct 2017 19:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tfSebk1BHHfNGj2o3awqCxK+MUilwM8nzbptmp2Nfzg=; b=FZ6nX2AIY+J2sHZjEvLvLqXy6fgZCND+aCIDqTpIGF494v1TSv4TtHTFKz+OXKJWk/ vG22fKoPoJ4/KFCMnqmi7v9QhB2qZajCLPRHZbpXi4Be54ELWg30UxS+WBQWIQm/ej1W oqNPGaf87Y2/4a8StvRm6FcYou4k2i2fWq35s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tfSebk1BHHfNGj2o3awqCxK+MUilwM8nzbptmp2Nfzg=; b=pFTEwC1IT/+0LHNSe1kIqrTzI+zofR8kQ5ySJ/+1QtwKSXlIhFCLTbyR1bk/st26zf XQd3M8ymzKHzI9q+Z1jLWKVvpsvKsLEw9B0KCK801Tg29wpxYE6HZGTX6x6lfHJrLCk1 GTJCaspHGcanN+mh6o80KS9n7S2RT4QCLu9M9vjXa1p1oP4q4qfK4yxDdZZmT49u9AoF rMyXt2gDWaQhg+m2CYefeJBPUU//lkapQHUFbU+hvVd/OnGsQ45ep9hmWsjLsLY+U+Bt 2rvsChkWXuZyDPQSfxAV5+CaSgfh8tyZeFoeZo/xiBEoqz+Tu8MW/++zKskW+w2eDvL/ z1jw== X-Gm-Message-State: AMCzsaX8rs4Qg4f3edGOMFJNIAsUz1jdRphCU0s4AwpHa2PZlocHCWw0 l0dZ5TJRmgq+AWmaA9axPxk2hw== X-Google-Smtp-Source: ABhQp+TheGwIDOE+q8E6qij4RmmuiHcyHxV8+ytbql2KIT8kY8bfYyotI22Bb1gt/Ko6QpDtLQ2cFg== X-Received: by 10.80.169.193 with SMTP id n59mr10102713edc.282.1509332175705; Sun, 29 Oct 2017 19:56:15 -0700 (PDT) Received: from localhost.localdomain (xd93dd96b.cust.hiper.dk. [217.61.217.107]) by smtp.gmail.com with ESMTPSA id u14sm7856415edd.47.2017.10.29.19.56.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Oct 2017 19:56:14 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, wanghaibin , Eric Auger , Christoffer Dall Subject: [PULL 5/8] KVM: arm/arm64: vgic-its: Fix return value for device table restore Date: Mon, 30 Oct 2017 03:56:00 +0100 Message-Id: <20171030025603.23550-6-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171030025603.23550-1-christoffer.dall@linaro.org> References: <20171030025603.23550-1-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: wanghaibin If ITT only contains invalid entries, vgic_its_restore_itt returns 1 and this is considered as an an error in vgic_its_restore_dte. Also in case the device table only contains invalid entries, the table restore fails and this is not correct. This patch fixes those 2 issues: - vgic_its_restore_itt now returns <= 0 values. If all ITEs are invalid, this is considered as successful. - vgic_its_restore_device_tables also returns <= 0 values. We also simplify the returned value computation in handle_l1_dte. Signed-off-by: wanghaibin Signed-off-by: Eric Auger Reviewed-by: Christoffer Dall Signed-off-by: Christoffer Dall --- virt/kvm/arm/vgic/vgic-its.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 77652885a7c1..76685f4c6261 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -1936,6 +1936,14 @@ static int vgic_its_save_itt(struct vgic_its *its, struct its_device *device) return 0; } +/** + * vgic_its_restore_itt - restore the ITT of a device + * + * @its: its handle + * @dev: device handle + * + * Return 0 on success, < 0 on error + */ static int vgic_its_restore_itt(struct vgic_its *its, struct its_device *dev) { const struct vgic_its_abi *abi = vgic_its_get_abi(its); @@ -1947,6 +1955,10 @@ static int vgic_its_restore_itt(struct vgic_its *its, struct its_device *dev) ret = scan_its_table(its, base, max_size, ite_esz, 0, vgic_its_restore_ite, dev); + /* scan_its_table returns +1 if all ITEs are invalid */ + if (ret > 0) + ret = 0; + return ret; } @@ -2103,10 +2115,7 @@ static int handle_l1_dte(struct vgic_its *its, u32 id, void *addr, ret = scan_its_table(its, gpa, SZ_64K, dte_esz, l2_start_id, vgic_its_restore_dte, NULL); - if (ret <= 0) - return ret; - - return 1; + return ret; } /** @@ -2136,8 +2145,9 @@ static int vgic_its_restore_device_tables(struct vgic_its *its) vgic_its_restore_dte, NULL); } + /* scan_its_table returns +1 if all entries are invalid */ if (ret > 0) - ret = -EINVAL; + ret = 0; return ret; }