Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp4105865ybb; Tue, 7 Apr 2020 00:28:55 -0700 (PDT) X-Google-Smtp-Source: APiQypIUWerhmvV4T+JHFYDPphPgH1g4lpxbDE1GPxIupZhO/RCPFODEmbVTrYJDnItRUuVW/yZ/ X-Received: by 2002:a9d:1423:: with SMTP id h32mr470710oth.359.1586244535247; Tue, 07 Apr 2020 00:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586244535; cv=none; d=google.com; s=arc-20160816; b=Nja3RE3YmsuIayFrF11iQfSm2waIxDUv9SK5dLQPAhiDuUtPjz2jessCiWB1SwNcuO kO/XzbSB0Fb+590c5Vpor4zk5kVZk8w5hxn2zACtV/SUCALA1fbMtCpmX8Cvb6YTfVdA JEl/EeZfdjyEtaTQT4a/IEhsE3VjWJuac8gY7oOORn2Wx6Q9B+7cX8m1N1lrI7JCuAKK uy7iD/d6ocQ7Dp0b4ecrf+yVXzRUR9X26HhXGFKMyMuCTGosMpSWfaFVQoR4HmJn+e7t M+uc83HdH8f/4oII8QG4R9vU1zSc0qf5Kwoz5Q6CXtuASxLwa+ZmOWt2odIUqDKskvXO hvUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=4HXCsqnZLsT/HrOG+im8RNV5ed+spwNHigK8Sg3u+D8=; b=qthVI5XM5vp+vSaYMlomVL3XDPT+8Bg1Gy0ytUQSDUG7H8cLEsQ/0+ncfW9SkN/vxI 6BsenivkmMEjKe90dalOqTY4XiHmKrBZwELoHjwMgC9I2EZj06OB6/ass4B7d6sHJelj X+Lrt1f62XJhezaMy2tH23IBHPybjeIzlBoww9lVf4HfQyiWlq+zXY/6XJ6okjfhbh+0 rrLKXDesv8t+elARo1th5TGbfpxxHtF7NxjXOluyujSn0djvTeZg899eUs+y5fXYNgvR joersnhOCRXBWCWHsAavaWC7l3vKDtvROGC1ilw5w3VxWGZSj62qrIMnzQe6hhFY3TaY uBbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=y752ThIB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f186si316898oia.64.2020.04.07.00.28.43; Tue, 07 Apr 2020 00:28:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=y752ThIB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727845AbgDGH2H (ORCPT + 99 others); Tue, 7 Apr 2020 03:28:07 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:33060 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727732AbgDGH16 (ORCPT ); Tue, 7 Apr 2020 03:27:58 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0377RaWN102119; Tue, 7 Apr 2020 07:27:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=4HXCsqnZLsT/HrOG+im8RNV5ed+spwNHigK8Sg3u+D8=; b=y752ThIBU/Y50dbF3wtIyUYouemOUyy9Pb2V2IHhKShom1HWSZOblxb0lZulOSESBtN7 n2Uccznp2YEZ4HfqEpAL1FY3WrheSh0j4eEiBsK4EswI/YiYCeLl3zJodCwrIR79/yXa ekHD8MZieMPDKdvHuYSm0T8OEiI5T9WbLXzfTsz5iJMfmFNhx3hYUDK2K2OaVTmWN+Hd U1l5Izgz1+ke7/5ZpFhrMhwwUB9tRJaGTVN7mdutY08P90HX9DRPJyOvIqWVM8f+0viE xafDn3bUSVHcWevkJrk9tku/YxeAFH+8Id/OLmNr4Hkrv67yEzgEQuSi2V9fvkYJ+0n9 Tw== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2120.oracle.com with ESMTP id 306jvn30yx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Apr 2020 07:27:40 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0377RR6G151298; Tue, 7 Apr 2020 07:27:40 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3020.oracle.com with ESMTP id 30741d9ucf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Apr 2020 07:27:40 +0000 Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0377RdO7011271; Tue, 7 Apr 2020 07:27:39 GMT Received: from linux-1.home (/92.157.90.160) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 07 Apr 2020 00:27:39 -0700 From: Alexandre Chartre To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, jpoimboe@redhat.com, peterz@infradead.org, jthierry@redhat.com, tglx@linutronix.de, alexandre.chartre@oracle.com Subject: [PATCH V2 6/9] x86/speculation: Change __FILL_RETURN_BUFFER to work with objtool Date: Tue, 7 Apr 2020 09:31:39 +0200 Message-Id: <20200407073142.20659-7-alexandre.chartre@oracle.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200407073142.20659-1-alexandre.chartre@oracle.com> References: <20200407073142.20659-1-alexandre.chartre@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9583 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=13 phishscore=0 malwarescore=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=875 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004070062 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9583 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=13 mlxlogscore=937 mlxscore=0 bulkscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 malwarescore=0 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004070061 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change __FILL_RETURN_BUFFER so that the stack state is deterministically defined for each iteration and that objtool can have an accurate view of the stack. Signed-off-by: Alexandre Chartre --- arch/x86/include/asm/nospec-branch.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 5c24a7b35166..9a946fd5e824 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -60,8 +60,8 @@ jmp 775b; \ 774: \ dec reg; \ - jnz 771b; \ - add $(BITS_PER_LONG/8) * nr, sp; + add $(BITS_PER_LONG/8) * 2, sp; \ + jnz 771b; #ifdef __ASSEMBLY__ -- 2.18.2