From nobody Fri May 3 09:31:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1614097613; cv=none; d=zohomail.com; s=zohoarc; b=mQYymhBaLKww4CMNSuVzh5O1qkVIMOF8lLZIvMXi7QxODJdkipOgRafL6adyFosuI26d8xJIjV8q/4gE5dsukChsUdmiZseejfDKvGmHaHez2gJjbN6JLPMzi1CGeR2GT9cOXj1QMIjA5m96ROis+1ks4tGZY7pVt17yb763ypw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614097613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=x8GTAvdmsyH+Pp0li/Vl3nOFzMKqCxBpQieMBY2N7/I=; b=P0G+gLjdyFXunN4M4tUwAE+Ly7kj7gO3SeHjqGBTwe8Uj5h+1iRNKKimqmmjnT2aZUOh+VdKOaaPqi+NNjEySPYLlXFNCyweIThIaWCgJqzbXmazcUm9HHwnB99qeSAiGr6WGd/3fPXF1eQPByF3W/gjKctQo7m2HdC8TZ6I0QU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614097612799477.69679501402265; Tue, 23 Feb 2021 08:26:52 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.88898.167298 (Exim 4.92) (envelope-from ) id 1lEaVz-0007fZ-PW; Tue, 23 Feb 2021 16:26:23 +0000 Received: by outflank-mailman (output) from mailman id 88898.167298; Tue, 23 Feb 2021 16:26:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lEaVz-0007fS-Ma; Tue, 23 Feb 2021 16:26:23 +0000 Received: by outflank-mailman (input) for mailman id 88898; Tue, 23 Feb 2021 16:26:22 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lEaVy-0007fN-HY for xen-devel@lists.xenproject.org; Tue, 23 Feb 2021 16:26:22 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fa8f8c93-3b77-4624-979d-c1926e38649e; Tue, 23 Feb 2021 16:26:21 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BD749AC1D; Tue, 23 Feb 2021 16:26:20 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: fa8f8c93-3b77-4624-979d-c1926e38649e X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1614097580; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8GTAvdmsyH+Pp0li/Vl3nOFzMKqCxBpQieMBY2N7/I=; b=A3SeXkLY1ANJcd40RWOUEDSk5mVdQ/bqXEvEmj8fAiYJcjYb/+L1HHL5J0WIczye/ltXIE WLSdk3KA4BqILQ31VrDh0VEDeEd8U5tiqvX1OSqGA40EzolPcB9ml6sOwf6fPkVJCo0GVo +Iu9NQqEJj3Aj0NwxicDKckdYmiKj60= To: Juergen Gross , Boris Ostrovsky Cc: "xen-devel@lists.xenproject.org" , "oleksandr_andrushchenko@epam.com" From: Jan Beulich Subject: [PATCH] xen-front-pgdir-shbuf: don't record wrong grant handle upon error Message-ID: <82414b0f-1b63-5509-7c1d-5bcc8239a3de@suse.com> Date: Tue, 23 Feb 2021 17:26:21 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" In order for subsequent unmapping to not mistakenly unmap handle 0, record a perceived always-invalid one instead. Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Reviewed-by: Oleksandr Andrushchenko --- v2: Use INVALID_GRANT_HANDLE. --- a/drivers/xen/xen-front-pgdir-shbuf.c +++ b/drivers/xen/xen-front-pgdir-shbuf.c @@ -305,11 +305,18 @@ static int backend_map(struct xen_front_ =20 /* Save handles even if error, so we can unmap. */ for (cur_page =3D 0; cur_page < buf->num_pages; cur_page++) { - buf->backend_map_handles[cur_page] =3D map_ops[cur_page].handle; - if (unlikely(map_ops[cur_page].status !=3D GNTST_okay)) + if (likely(map_ops[cur_page].status =3D=3D GNTST_okay)) { + buf->backend_map_handles[cur_page] =3D + map_ops[cur_page].handle; + } else { + buf->backend_map_handles[cur_page] =3D + INVALID_GRANT_HANDLE; + if (!ret) + ret =3D -ENXIO; dev_err(&buf->xb_dev->dev, "Failed to map page %d: %d\n", cur_page, map_ops[cur_page].status); + } } =20 if (ret) {