Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3696305pxb; Mon, 24 Jan 2022 15:37:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLqxossjUKjIeBvWRMw1mO+Z1ExMNBKfmwNnxhyHCUxKMNz4vj2vvmjnIBKb+scWxcai1S X-Received: by 2002:a63:b245:: with SMTP id t5mr13295644pgo.231.1643067462607; Mon, 24 Jan 2022 15:37:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643067462; cv=none; d=google.com; s=arc-20160816; b=I9RPDCL8Vjw6GVN9B3vZ4iVeYxUMfYkE9Zh4xT85U/rei5TMF34EwrbBa+Ood6Wpfq VFZjMaPu3FzUy8fRzZvXjBMkUozKJbh50XJuCkb2p0IS17cE0gRLssDNKYwU/Dr5pCxG Pdp+W6k8lRRIU6yjInM2p6dZj2pDpZSTlXb3LtQnAWGy+Tghk50l5BuvXpa/AvBI2N7i LuBESiKhAc5vm/j0+80eOpP2I4eqCf7Ex/8VEqtTneDDoWA4nYQiy9Odj+LPfqLH+A5F bWpyagZJHgKNeNriRCitazf5iOrPNMC//D4O97CS2fo/CoD7mqU6yvF7sTfT+K7iwnkH AJeg== 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=b4UdjSz5NYtQinQlQ94XoaqaHbQcVUOxbqVn67Al5y4=; b=nVe1ZH6JcY+OFlRQs4Xwht8Do3zsYlXqes3hdX9i9x84kZHwQ6nA6GUhwb7NYRR6gA a9nb9QrChLywVy1Imd1lJEdDPrvX/bH84rYr6Mfu6lrDvyh89EctcMkKTBPHXcE/bg4v xjm2+/BgOJc+DxHJ2EiGmV0etXKs9KRniiPNPIFjV9OhgEtWMD2xDotKB0PX6ZRyDjgT pQ6kE23dbCSKboIwQF7TLxxRCUarPSeDL0hKRkUJQ2sBAwr9EVTSz+XOLgAtgHIrXJ+6 Ddu5SFbjHI32dvJJZkGF1G1xHKzXVQRMc2JJMJFz7BKZNg9tPSoPtVCpkIkVfkwuPBVV b6Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qY6+Ay+T; 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 k62si6511968pgd.675.2022.01.24.15.37.30; Mon, 24 Jan 2022 15:37:42 -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=qY6+Ay+T; 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 S1350318AbiAXX2o (ORCPT + 99 others); Mon, 24 Jan 2022 18:28:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1451757AbiAXWNN (ORCPT ); Mon, 24 Jan 2022 17:13:13 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0733DC0E03DF; Mon, 24 Jan 2022 12:43:51 -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 ams.source.kernel.org (Postfix) with ESMTPS id B916BB810BD; Mon, 24 Jan 2022 20:43:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3475C340E5; Mon, 24 Jan 2022 20:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057028; bh=Ss+KyW9+v4+zPtZvCbZxmRTFAjt5mNV30rcy4WIJht8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qY6+Ay+TbLZHU2ys/Tis8uxbMeMy2GWJhM0zjUUcXqiTWl1/mOJy7AdVEnBLchExo Vd7JAop8njqEjZ6s3Xrad4pG0WzvhqT4jxrCttZ//DF4LyCwjnj2zvxKvxfrL4sqFO EG3jlpqaeqVbW/xDJnvLnMdAqg81MM/szs8dQI0A= 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.15 677/846] xen/gntdev: fix unmap notification order Date: Mon, 24 Jan 2022 19:43:14 +0100 Message-Id: <20220124184124.424938108@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@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 @@ -250,13 +250,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); }