From nobody Mon Feb 9 21:12:11 2026 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=1610636854; cv=none; d=zohomail.com; s=zohoarc; b=Px21KOuFb7UB/c8xP5J1Uw0btBS8Rla24kTVAilKZGYG3q6xU/Kba2jmLTKXkvC/PiIdpwpRYMNmAdLSKckbucsxnAG4/h7ygHmrSPM3/JH9dFLu9M3vKiw2NaLe+MZHh1NokP53y7y50w0pu4RLw0mp/f2zBVeW7GoNRMc112o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610636854; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8epE1HCtTCPnsbXkHJXiQ7C0R5pieH3DxasIhNaIZuA=; b=YhSVJEOHs+JTDxQcY6g8kqjhNeUURjShwzD/GtUBoNkh1jlFHrlflGA1WX2Bx7D6HjU4eOiLAWN2m/zv8tGub/CPllO8zzb6WdCicwgQ7XvLYTFjgHCVSvu8g1TOiH531zBOAutNFx6F50CNAOjpvhrxj+G+7mA7RWsi+b8hvMQ= 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 1610636854237424.50177962307407; Thu, 14 Jan 2021 07:07:34 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.67098.119480 (Exim 4.92) (envelope-from ) id 1l04DT-0005rQ-Qs; Thu, 14 Jan 2021 15:07:15 +0000 Received: by outflank-mailman (output) from mailman id 67098.119480; Thu, 14 Jan 2021 15:07:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l04DT-0005rJ-Nz; Thu, 14 Jan 2021 15:07:15 +0000 Received: by outflank-mailman (input) for mailman id 67098; Thu, 14 Jan 2021 15:07:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l04DS-0005r7-8B for xen-devel@lists.xenproject.org; Thu, 14 Jan 2021 15:07:14 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c7525e7f-79d4-4910-b1ce-4b6ca41d03ae; Thu, 14 Jan 2021 15:07:13 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C2083B94B; Thu, 14 Jan 2021 15:07:11 +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: c7525e7f-79d4-4910-b1ce-4b6ca41d03ae 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=1610636832; 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: in-reply-to:in-reply-to:references:references; bh=8epE1HCtTCPnsbXkHJXiQ7C0R5pieH3DxasIhNaIZuA=; b=V4x+akvE5bYYuvJY0idoahtblbLqBtS0kG/g9/y35rERlmJkOaUt7XndUyRsJdSEZaPhir QTJnM94Xk7R9WJJxr8gC17INVQqUZ6plRcMnKnno9AMFD+azNlCKZkUpDK86v0VugkOI0l 6s/GDQm1zHbIdgX/awJAtDrLDAmIq7M= Subject: [PATCH 08/17] x86: move stac()/clac() from {get,put}_unsafe_asm() ... From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Tim Deegan , George Dunlap References: <4f1975a9-bdd9-f556-9db5-eb6c428f258f@suse.com> Message-ID: <4d2506ad-b220-ad6a-9138-ff0d28410bab@suse.com> Date: Thu, 14 Jan 2021 16:07:07 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <4f1975a9-bdd9-f556-9db5-eb6c428f258f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" ... to {get,put}_unsafe_size(). There's no need to have the macros expanded once per case label in the latter. This also makes the former well-formed single statements again. No change in generated code. Signed-off-by: Jan Beulich --- a/xen/include/asm-x86/uaccess.h +++ b/xen/include/asm-x86/uaccess.h @@ -155,7 +155,6 @@ struct __large_struct { unsigned long bu * aliasing issues. */ #define put_unsafe_asm(x, addr, GUARD, err, itype, rtype, ltype, errret) \ - stac(); \ __asm__ __volatile__( \ GUARD( \ " guest_access_mask_ptr %[ptr], %[scr1], %[scr2]\n" \ @@ -170,11 +169,9 @@ struct __large_struct { unsigned long bu : [ret] "+r" (err), [ptr] "=3D&r" (dummy_) \ GUARD(, [scr1] "=3D&r" (dummy_), [scr2] "=3D&r" (dummy_)) \ : [val] ltype (x), "m" (__m(addr)), \ - "[ptr]" (addr), [errno] "i" (errret)); \ - clac() + "[ptr]" (addr), [errno] "i" (errret)) =20 #define get_unsafe_asm(x, addr, GUARD, err, rtype, ltype, errret) \ - stac(); \ __asm__ __volatile__( \ GUARD( \ " guest_access_mask_ptr %[ptr], %[scr1], %[scr2]\n" \ @@ -191,12 +188,12 @@ struct __large_struct { unsigned long bu [ptr] "=3D&r" (dummy_) \ GUARD(, [scr1] "=3D&r" (dummy_), [scr2] "=3D&r" (dummy_)) \ : "m" (__m(addr)), "[ptr]" (addr), \ - [errno] "i" (errret)); \ - clac() + [errno] "i" (errret)) =20 #define put_unsafe_size(x, ptr, size, grd, retval, errret) = \ do { = \ retval =3D 0; = \ + stac(); = \ switch ( size ) = \ { = \ long dummy_; = \ @@ -214,6 +211,7 @@ do { break; = \ default: __put_user_bad(); = \ } = \ + clac(); = \ } while ( false ) =20 #define put_guest_size(x, ptr, size, retval, errret) \ @@ -222,6 +220,7 @@ do { #define get_unsafe_size(x, ptr, size, grd, retval, errret) = \ do { = \ retval =3D 0; = \ + stac(); = \ switch ( size ) = \ { = \ long dummy_; = \ @@ -231,6 +230,7 @@ do { case 8: get_unsafe_asm(x, ptr, grd, retval, "", "=3Dr", errret); brea= k; \ default: __get_user_bad(); = \ } = \ + clac(); = \ } while ( false ) =20 #define get_guest_size(x, ptr, size, retval, errret) = \