From mboxrd@z Thu Jan 1 00:00:00 1970 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=DKIM_INVALID,DKIM_SIGNED, 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 B0BDFC10DCE for ; Mon, 16 Mar 2020 02:34:46 +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 7E0B920767 for ; Mon, 16 Mar 2020 02:34:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="JfnYNtjC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E0B920767 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none 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.89) (envelope-from ) id 1jDfZy-0004sf-8N; Mon, 16 Mar 2020 02:34:10 +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.89) (envelope-from ) id 1jDfZx-0004sX-9H for xen-devel@lists.xenproject.org; Mon, 16 Mar 2020 02:34:09 +0000 X-Inumbo-ID: 9a63cd9e-672e-11ea-b769-12813bfff9fa Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9a63cd9e-672e-11ea-b769-12813bfff9fa; Mon, 16 Mar 2020 02:34:04 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 82EBB206E9; Mon, 16 Mar 2020 02:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584326044; bh=hcTIdJiCXvD/krcQTIT1ht5ObWgrP9GQXXZnj8Jlw7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfnYNtjCNxMe9zicNGm/QBDAOSlenHB7OBs5gRFfLNX/9kqvcISmAoFv2uVxmiOHl E+kTtwbDGxUkz1tUDwn/IP6vbW+crJ25+8ex0SM2lLE1dLZ+0AfTI7nuN2SnRAIrRe nB8/DBjaNXP1nmFhEmTSdCx3APkd/cNj9mkUTFuI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Sun, 15 Mar 2020 22:33:15 -0400 Message-Id: <20200316023319.749-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200316023319.749-1-sashal@kernel.org> References: <20200316023319.749-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Subject: [Xen-devel] [PATCH AUTOSEL 5.5 37/41] xenbus: req->err should be updated before req->state X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Dongli Zhang , Julien Grall , Boris Ostrovsky , xen-devel@lists.xenproject.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogRG9uZ2xpIFpoYW5nIDxkb25nbGkuemhhbmdAb3JhY2xlLmNvbT4KClsgVXBzdHJlYW0g Y29tbWl0IDgxMzBiOWQ1YjVhYmYyNmY5OTI3YjQ4N2MxNTMxOWExODc3NzVmMzQgXQoKVGhpcyBw YXRjaCBhZGRzIHRoZSBiYXJyaWVyIHRvIGd1YXJhbnRlZSB0aGF0IHJlcS0+ZXJyIGlzIGFsd2F5 cyB1cGRhdGVkCmJlZm9yZSByZXEtPnN0YXRlLgoKT3RoZXJ3aXNlLCByZWFkX3JlcGx5KCkgd291 bGQgbm90IHJldHVybiBFUlJfUFRSKHJlcS0+ZXJyKSBidXQKcmVxLT5ib2R5LCB3aGVuIHByb2Nl c3Nfd3JpdGVzKCktPnhiX3dyaXRlKCkgaXMgZmFpbGVkLgoKU2lnbmVkLW9mZi1ieTogRG9uZ2xp IFpoYW5nIDxkb25nbGkuemhhbmdAb3JhY2xlLmNvbT4KTGluazogaHR0cHM6Ly9sb3JlLmtlcm5l bC5vcmcvci8yMDIwMDMwMzIyMTQyMy4yMTk2Mi0yLWRvbmdsaS56aGFuZ0BvcmFjbGUuY29tClJl dmlld2VkLWJ5OiBKdWxpZW4gR3JhbGwgPGpncmFsbEBhbWF6b24uY29tPgpTaWduZWQtb2ZmLWJ5 OiBCb3JpcyBPc3Ryb3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgpTaWduZWQtb2Zm LWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy94ZW4veGVu YnVzL3hlbmJ1c19jb21tcy5jIHwgMiArKwogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygr KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5idXNfY29tbXMuYyBiL2RyaXZl cnMveGVuL3hlbmJ1cy94ZW5idXNfY29tbXMuYwppbmRleCA4NTJlZDE2MWZjMmE3Li5lYjUxNTFm YzhlZmFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVzX2NvbW1zLmMKKysr IGIvZHJpdmVycy94ZW4veGVuYnVzL3hlbmJ1c19jb21tcy5jCkBAIC0zOTcsNiArMzk3LDggQEAg c3RhdGljIGludCBwcm9jZXNzX3dyaXRlcyh2b2lkKQogCWlmIChzdGF0ZS5yZXEtPnN0YXRlID09 IHhiX3JlcV9zdGF0ZV9hYm9ydGVkKQogCQlrZnJlZShzdGF0ZS5yZXEpOwogCWVsc2UgeworCQkv KiB3cml0ZSBlcnIsIHRoZW4gdXBkYXRlIHN0YXRlICovCisJCXZpcnRfd21iKCk7CiAJCXN0YXRl LnJlcS0+c3RhdGUgPSB4Yl9yZXFfc3RhdGVfZ290X3JlcGx5OwogCQl3YWtlX3VwKCZzdGF0ZS5y ZXEtPndxKTsKIAl9Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGlu Zm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 D46D5C10DCE for ; Mon, 16 Mar 2020 02:40:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AB73205C9 for ; Mon, 16 Mar 2020 02:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584326422; bh=hcTIdJiCXvD/krcQTIT1ht5ObWgrP9GQXXZnj8Jlw7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=y1BXQjxy6+8t3zpCy49KhiCUMBN9FeG01KeMiSKLcpjOKOM06mseEvlbP/1HJraq/ i4JdbzMSAmGpNE/4xAAMES2IeNraBFaVr3pjnga7oefRGccYKalGpirHeHU6Wu3acF /WOTwSsRkq0m8IXpybATJc75JGIEtpNQ905muqZA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729741AbgCPCeF (ORCPT ); Sun, 15 Mar 2020 22:34:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:37192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729380AbgCPCeE (ORCPT ); Sun, 15 Mar 2020 22:34:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 82EBB206E9; Mon, 16 Mar 2020 02:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584326044; bh=hcTIdJiCXvD/krcQTIT1ht5ObWgrP9GQXXZnj8Jlw7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfnYNtjCNxMe9zicNGm/QBDAOSlenHB7OBs5gRFfLNX/9kqvcISmAoFv2uVxmiOHl E+kTtwbDGxUkz1tUDwn/IP6vbW+crJ25+8ex0SM2lLE1dLZ+0AfTI7nuN2SnRAIrRe nB8/DBjaNXP1nmFhEmTSdCx3APkd/cNj9mkUTFuI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dongli Zhang , Julien Grall , Boris Ostrovsky , Sasha Levin , xen-devel@lists.xenproject.org Subject: [PATCH AUTOSEL 5.5 37/41] xenbus: req->err should be updated before req->state Date: Sun, 15 Mar 2020 22:33:15 -0400 Message-Id: <20200316023319.749-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200316023319.749-1-sashal@kernel.org> References: <20200316023319.749-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dongli Zhang [ Upstream commit 8130b9d5b5abf26f9927b487c15319a187775f34 ] This patch adds the barrier to guarantee that req->err is always updated before req->state. Otherwise, read_reply() would not return ERR_PTR(req->err) but req->body, when process_writes()->xb_write() is failed. Signed-off-by: Dongli Zhang Link: https://lore.kernel.org/r/20200303221423.21962-2-dongli.zhang@oracle.com Reviewed-by: Julien Grall Signed-off-by: Boris Ostrovsky Signed-off-by: Sasha Levin --- drivers/xen/xenbus/xenbus_comms.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c index 852ed161fc2a7..eb5151fc8efab 100644 --- a/drivers/xen/xenbus/xenbus_comms.c +++ b/drivers/xen/xenbus/xenbus_comms.c @@ -397,6 +397,8 @@ static int process_writes(void) if (state.req->state == xb_req_state_aborted) kfree(state.req); else { + /* write err, then update state */ + virt_wmb(); state.req->state = xb_req_state_got_reply; wake_up(&state.req->wq); } -- 2.20.1