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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 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 3F40FC433DF for ; Tue, 16 Jun 2020 09:33:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 0903320707 for ; Tue, 16 Jun 2020 09:33:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0903320707 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl7yN-00083P-9L for qemu-devel@archiver.kernel.org; Tue, 16 Jun 2020 05:33:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl7xQ-0007Yu-7x; Tue, 16 Jun 2020 05:32:40 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:1980) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl7xL-0007sG-Dy; Tue, 16 Jun 2020 05:32:39 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 05G93AM8008845; Tue, 16 Jun 2020 05:32:32 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 31pc7nftts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Jun 2020 05:32:32 -0400 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 05G93ilT011643; Tue, 16 Jun 2020 05:32:32 -0400 Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com with ESMTP id 31pc7nftsp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Jun 2020 05:32:32 -0400 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 05G9U3jq012273; Tue, 16 Jun 2020 09:32:29 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma01fra.de.ibm.com with ESMTP id 31mpe7j2ad-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Jun 2020 09:32:29 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 05G9WQTR59703480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Jun 2020 09:32:26 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A667F5205F; Tue, 16 Jun 2020 09:32:26 +0000 (GMT) Received: from oc2783563651 (unknown [9.145.56.227]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 124C45204E; Tue, 16 Jun 2020 09:32:26 +0000 (GMT) Date: Tue, 16 Jun 2020 11:31:23 +0200 From: Halil Pasic To: Christian Borntraeger Subject: Re: [PATCH 1/2] virtio-ccw: fix virtio_set_ind_atomic Message-ID: <20200616113123.27d7d3f2.pasic@linux.ibm.com> In-Reply-To: <11e8278e-23cc-1e7f-4086-10ecef75b96a@de.ibm.com> References: <20200616045035.51641-1-pasic@linux.ibm.com> <20200616045035.51641-2-pasic@linux.ibm.com> <11e8278e-23cc-1e7f-4086-10ecef75b96a@de.ibm.com> Organization: IBM X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.687 definitions=2020-06-16_03:2020-06-15, 2020-06-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 malwarescore=0 cotscore=-2147483648 priorityscore=1501 lowpriorityscore=0 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006160066 Received-SPF: pass client-ip=148.163.156.1; envelope-from=pasic@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/16 05:32:33 X-ACL-Warn: Detected OS = Linux 3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Matthew Rosato , "Michael S. Tsirkin" , Cornelia Huck , David Hildenbrand , qemu-devel@nongnu.org, qemu-s390x@nongnu.org, Paolo Bonzini , Andreas Krebbel , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 16 Jun 2020 07:58:53 +0200 Christian Borntraeger wrote: > > > On 16.06.20 06:50, Halil Pasic wrote: > > The atomic_cmpxchg() loop is broken because we occasionally end up with > > old and _old having different values (a legit compiler can generate code > > that accessed *ind_addr again to pick up a value for _old instead of > > using the value of old that was already fetched according to the > > rules of the abstract machine). This means the underlying CS instruction > > may use a different old (_old) than the one we intended to use if > > atomic_cmpxchg() performed the xchg part. > > > > Let us use volatile to force the rules of the abstract machine for > > accesses to *ind_addr. Let us also rewrite the loop so, we that the > > new old is used to compute the new desired value if the xchg part > > is not performed. > > > > Signed-off-by: Halil Pasic > > Reported-by: Andre Wild > > Fixes: 7e7494627f ("s390x/virtio-ccw: Adapter interrupt support.") > > --- > > hw/s390x/virtio-ccw.c | 18 ++++++++++-------- > > 1 file changed, 10 insertions(+), 8 deletions(-) > > > > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > > index c1f4bb1d33..3c988a000b 100644 > > --- a/hw/s390x/virtio-ccw.c > > +++ b/hw/s390x/virtio-ccw.c > > @@ -786,9 +786,10 @@ static inline VirtioCcwDevice *to_virtio_ccw_dev_fast(DeviceState *d) > > static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc, > > uint8_t to_be_set) > > { > > - uint8_t ind_old, ind_new; > > + uint8_t expected, actual; > > hwaddr len = 1; > > - uint8_t *ind_addr; > > + /* avoid multiple fetches */ > > + uint8_t volatile *ind_addr; > > > > ind_addr = cpu_physical_memory_map(ind_loc, &len, true); > > if (!ind_addr) { > > @@ -796,14 +797,15 @@ static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc, > > __func__, sch->cssid, sch->ssid, sch->schid); > > return -1; > > } > > + actual = *ind_addr; > > do { > > - ind_old = *ind_addr; > > to make things easier to understand. Adding a barrier in here also fixes the issue. > Reasoning follows below: > > > - ind_new = ind_old | to_be_set; > > with an analysis from Andreas (cc) > > #define atomic_cmpxchg__nocheck(ptr, old, new) ({ \ > > typeof_strip_qual(*ptr) _old = (old); \ > > (void)__atomic_compare_exchange_n(ptr, &_old, new, false, \ > > __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); \ > > _old; \ > > }) > There is also the #define atomic_cmpxchg(ptr, old, new) __sync_val_compare_and_swap(ptr, old, new) variant, I guess, when the C11 stuff is not available. I don't know if that variant is guaranteed to not have problems with multiple loads. > ind_old is copied into _old in the macro. Instead of doing the copy from the > register the compiler reloads the value from memory. The result is that _old > and ind_old end up having different values. _old in r1 with the bits set > already and ind_old in r10 with the bits cleared. _old gets updated by CS > and matches ind_old afterwards - both with the bits being 0. So the != > compare is false and the loop is left without having set any bits. > > > Paolo (to), > I am asking myself if it would be safer to add a barrier or something like > this in the macros in include/qemu/atomic.h. > I think accessing the initial value via a volatile pointer initially and using the value loaded by cmpxchg for subsequent iterations is cleaner. Regards, Halil > > > - } while (atomic_cmpxchg(ind_addr, ind_old, ind_new) != ind_old); > > - trace_virtio_ccw_set_ind(ind_loc, ind_old, ind_new); > > - cpu_physical_memory_unmap(ind_addr, len, 1, len); > > + expected = actual; > > + actual = atomic_cmpxchg(ind_addr, expected, expected | to_be_set); > > + } while (actual != expected); > > + trace_virtio_ccw_set_ind(ind_loc, actual, actual | to_be_set); > > + cpu_physical_memory_unmap((void *)ind_addr, len, 1, len); > > > > - return ind_old; > > + return actual; > > } > > > > static void virtio_ccw_notify(DeviceState *d, uint16_t vector) > > > > >