Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3981595pxb; Tue, 25 Jan 2022 00:35:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlhr328Gi33xX2zHH130poowpYhC1CzyKDBigv7K8MrJUBrLJxdHqv/4zAXPeJ9eUrKwn6 X-Received: by 2002:a62:8490:0:b0:4c8:aca8:52cd with SMTP id k138-20020a628490000000b004c8aca852cdmr10249066pfd.10.1643099757670; Tue, 25 Jan 2022 00:35:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643099757; cv=none; d=google.com; s=arc-20160816; b=esfehD89suiuPucpoAuLqjxftkN2ItVYo6bVynMcVfatLiwgjqLQ2sTQShv4yR4Y7J 6gpBGQEviSodGQZOaMomApvX6vWm5Po4yzaRG0X5jnU3MPs9y7JhIdxL6CCqKaNRWWNZ gSyyf2Y/nNsoMYOs6Vc3jwCJLJroDcP2wzTPc5nQs5+FSEde12Q4F4w15500A/OSHiMe M7yKussn0Lk23GjHGG3C0RQf/ztWX2BFocVLnHx5rHCk8fNCX7wCokWy8SQ8x3b4JBOD sJy1I8qgRW+QyQKYrHy7grPpg1iE5aSuG72OStEG8jJNd0C8d9wv1BbHaN++1Lh9mQrN xvwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9oiaGmT20mGLJ2cpF4l8QCWel23Dz2+kdjD0yucp9Sg=; b=MzLH/ItiAbFLf+O2kfjRJeminHuhhrwImNuNe+a42vuUEmlLfx20WxurVubnDz18Tj SCmXTs4uY8bzqO6cvvdDiHyyOWyhZyTMhiHP8gBU/DCDbQjFg11kR9CmqV8Or78wNezr BADcFX/UNFqKQatFeN4szfK4fMHcFRnY71hZ81oiq7itAaw863Hwh6zwiqEMtz9bV/GD B6hvJ85jobT818rvVIIHpg+w6Y7OWbVAQSlUroHDZ709aUoUaheAa8d5McLE7iMa1UBZ tW6/uqu3IYBdp2cqh+7kU9n0cRX+lkf3R69Ot44A2VHkulS6ZlvS9KLM+heZv5pdzObU VlJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ugOUh+ra; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r20si13899016pgu.89.2022.01.25.00.35.39; Tue, 25 Jan 2022 00:35:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ugOUh+ra; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1313525AbiAYCsq (ORCPT + 99 others); Mon, 24 Jan 2022 21:48:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359523AbiAXVDK (ORCPT ); Mon, 24 Jan 2022 16:03:10 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 899D2C06B5A2; Mon, 24 Jan 2022 12:03:37 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2A77161333; Mon, 24 Jan 2022 20:03:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01A9FC340E5; Mon, 24 Jan 2022 20:03:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054616; bh=lRlIHxLA+FhWCYJVfDqIdzQVSQrZgqEhG2DBKd2bWcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ugOUh+ratmJmDOWIFfv5Vq/CF5vAKogQlUyQS+kawCwA9W9czIWmUi1qxyPUmXi+N ALWR8S7JpfKuekQDosr01GZgHZAImyFL/B2BoF/BRVFNgVG6Ay9rAfFfMpmkjTWq97 zNUeF0cilW+VJfKJLEhnUQediNk0l44kmxJasQJs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oleksandr Andrushchenko , Boris Ostrovsky , Juergen Gross Subject: [PATCH 5.10 447/563] xen/gntdev: fix unmap notification order Date: Mon, 24 Jan 2022 19:43:32 +0100 Message-Id: <20220124184039.913055821@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleksandr Andrushchenko commit ce2f46f3531a03781181b7f4bd1ff9f8c5086e7e upstream. While working with Xen's libxenvchan library I have faced an issue with unmap notifications sent in wrong order if both UNMAP_NOTIFY_SEND_EVENT and UNMAP_NOTIFY_CLEAR_BYTE were requested: first we send an event channel notification and then clear the notification byte which renders in the below inconsistency (cli_live is the byte which was requested to be cleared on unmap): [ 444.514243] gntdev_put_map UNMAP_NOTIFY_SEND_EVENT map->notify.event 6 libxenvchan_is_open cli_live 1 [ 444.515239] __unmap_grant_pages UNMAP_NOTIFY_CLEAR_BYTE at 14 Thus it is not possible to reliably implement the checks like - wait for the notification (UNMAP_NOTIFY_SEND_EVENT) - check the variable (UNMAP_NOTIFY_CLEAR_BYTE) because it is possible that the variable gets checked before it is cleared by the kernel. To fix that we need to re-order the notifications, so the variable is first gets cleared and then the event channel notification is sent. With this fix I can see the correct order of execution: [ 54.522611] __unmap_grant_pages UNMAP_NOTIFY_CLEAR_BYTE at 14 [ 54.537966] gntdev_put_map UNMAP_NOTIFY_SEND_EVENT map->notify.event 6 libxenvchan_is_open cli_live 0 Cc: stable@vger.kernel.org Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Boris Ostrovsky Link: https://lore.kernel.org/r/20211210092817.580718-1-andr2000@gmail.com Signed-off-by: Juergen Gross Signed-off-by: Greg Kroah-Hartman --- drivers/xen/gntdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -240,13 +240,13 @@ void gntdev_put_map(struct gntdev_priv * if (!refcount_dec_and_test(&map->users)) return; + if (map->pages && !use_ptemod) + unmap_grant_pages(map, 0, map->count); + if (map->notify.flags & UNMAP_NOTIFY_SEND_EVENT) { notify_remote_via_evtchn(map->notify.event); evtchn_put(map->notify.event); } - - if (map->pages && !use_ptemod) - unmap_grant_pages(map, 0, map->count); gntdev_free_map(map); }