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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3F61EB64DE for ; Tue, 10 Sep 2024 14:34:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D5FA8D0080; Tue, 10 Sep 2024 10:34:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 785A18D0002; Tue, 10 Sep 2024 10:34:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 625F88D0080; Tue, 10 Sep 2024 10:34:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 430A78D0002 for ; Tue, 10 Sep 2024 10:34:59 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DFDCBA7C73 for ; Tue, 10 Sep 2024 14:34:58 +0000 (UTC) X-FDA: 82549075476.15.622891C Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by imf01.hostedemail.com (Postfix) with ESMTP id 826AA40013 for ; Tue, 10 Sep 2024 14:34:56 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.232 as permitted sender) smtp.mailfrom=ebiederm@xmission.com; dmarc=pass (policy=none) header.from=xmission.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725978844; a=rsa-sha256; cv=none; b=MjongnfBMV2rzP6NjXDCxZmVtT+Ts05hCUynaIKq96qOCIWC00kp9i3dVlnvX0Apf6dNyZ syB/ghbeqAltF2ypRuCUDeIPZJITCc08nFnzklKIssl+BntWmm4dg5LCSXZZ2d6f3NWjKp YAtcUclPwVdmV4dJtl05xhAFeAYNqto= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.232 as permitted sender) smtp.mailfrom=ebiederm@xmission.com; dmarc=pass (policy=none) header.from=xmission.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725978844; h=from:from:sender:reply-to:subject:subject: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=d4lWtnFAuBvxGbu+LBO/37ZotJtEwWTPcCGhDhCXN6I=; b=O1abihWfmUKwzVMVGzVbnF0pr/KY4LAUZULUwLQ/F3Q5UhsVgoqjdfDAOa8eT+7NZ+STpi YWAImmBNLyLePhNv3+D/zopxadHXh+1Do9Xh5Ux/uWuwj4Bq5Kcy89DupPQ1Q1M2cYcWWp ThZ4qTCI14cvRVrTgC2YPfq/i+hzB5k= Received: from in02.mta.xmission.com ([166.70.13.52]:42914) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1so1xG-00FsQo-5h; Tue, 10 Sep 2024 08:34:54 -0600 Received: from ip68-227-165-127.om.om.cox.net ([68.227.165.127]:40992 helo=email.froward.int.ebiederm.org.xmission.com) by in02.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1so1xF-009ILd-83; Tue, 10 Sep 2024 08:34:53 -0600 From: "Eric W. Biederman" To: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= Cc: Andy Lutomirski , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Kees Cook , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20240910-x86-vdso-ifdef-v1-0-877c9df9b081@linutronix.de> <20240910-x86-vdso-ifdef-v1-2-877c9df9b081@linutronix.de> Date: Tue, 10 Sep 2024 09:34:46 -0500 In-Reply-To: <20240910-x86-vdso-ifdef-v1-2-877c9df9b081@linutronix.de> ("Thomas =?utf-8?Q?Wei=C3=9Fschuh=22's?= message of "Tue, 10 Sep 2024 12:11:36 +0200") Message-ID: <8734m7d1bt.fsf@email.froward.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-XM-SPF: eid=1so1xF-009ILd-83;;;mid=<8734m7d1bt.fsf@email.froward.int.ebiederm.org>;;;hst=in02.mta.xmission.com;;;ip=68.227.165.127;;;frm=ebiederm@xmission.com;;;spf=pass X-XM-AID: U2FsdGVkX1/5nJlFCi/KfV2IZRNiDXTTg5WDWy0TuzA= Subject: Re: [PATCH 2/2] x86: vdso: Remove redundant ifdeffery around in_ia32_syscall() X-SA-Exim-Connect-IP: 166.70.13.52 X-SA-Exim-Rcpt-To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, kees@kernel.org, hpa@zytor.com, x86@kernel.org, dave.hansen@linux.intel.com, bp@alien8.de, mingo@redhat.com, luto@kernel.org, thomas.weissschuh@linutronix.de X-SA-Exim-Mail-From: ebiederm@xmission.com X-SA-Exim-Scanned: No (on out02.mta.xmission.com); SAEximRunCond expanded to false X-Stat-Signature: mto31aqan7qttyji1b73sioc49pnm49m X-Rspamd-Queue-Id: 826AA40013 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1725978896-789423 X-HE-Meta: U2FsdGVkX18dwFLDe6pIZGp2JHD7PHAP7dNA+yiUX68NWnsJPpUwBSVUWHQIWCWKoajqZgsPr3RjAF7GjmyAVJn2Ag5mKsaKVc1ka0ASVICRcg8E2NNxcUHu6v2oo852FLRgMRNADNEbKJz4zhfgPEnr8yzwU0kOtQ9FSyRvNPdhsik7OvhTcqudgR9PZxCkjy7ASQ96eJd2lhtmbQVOdIrROzd0fwueS4n9Wm+GzSYUSGjgvLeHX8Dgk1SxbAWcZDyhMQbTudVy2L+bsW6TSyCly5KnEQwxFe2ZwdbR1f9CWYWHw5JkPdjFkvXLoLFLZAwf2HQbzRoyLy4BySTCc+AAPq3sTuULW1ZYXJ+8mKxJbax3dfGXvfUnyhULP9v6f1X6Ymfj+nbidqVArR6erxSwSbyAp/dWkmc1DCnhymtK8YV50RDjMH+mFWSOEKZUfDGXokiHq0hkl+Cs3WijjC1ETHCbHF72YArlgkECD2NvHzuiVYJhrsmOBBQ90f0+9eBmGuvHhO/A9WMc1K38SKTNeY1dR+JvFPlyhqqOr4HDQBHo7n+/ua5dGM9vwiM0bx8QPN/idXNCrU/gofIx8MyXNQNANQlGLvFAiSe/Xp4OWsMVoUJZ21vflQfNYSSkoG8oCOxjvzWWPJ99ad8yDD0JqbGaaeEeOLQGupY/m+G1ARqbqPOm5N33bHSRNSPdngHQaKrYm7cfMdB0+qN08ejmHFBjK5UPYFexOQJd7yyWzaV+8E15QKSswx2qFJrWDDE67OMNnUJ9XZ8tiofEaicwyl80N9cEnzMshlLsNsU9nDAp4JgO3ppINJxFuWIz712fa5G+VdQfa9E91RVbB32GXk7bCw1Ha3pa5BZtVeQZk0w2VPBGY92b0/iUgxRU7D+iLHS03lWizo6zpYhNa1rRCBhrqik4rzi85J9VorLDBG1s6KJAJ9pKI76wDQKdxW6fWzd3NSW6Wd76sX7 jiTWmr11 RXhzzkQZ4U4RackALhP9KRNb9TkL2gyLVhg/d5ASmoBaFgjg4afOCA86DBLwJzwWHjvV621cF5iYZF0DpK26gZ0oFEvC4vanlqGb853S39HTC7Yb01JLJtxWeDA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Thomas Wei=C3=9Fschuh writes: > The ifdefs only guard code that is also guarded by in_ia32_syscall(), > which already contains the same ifdefs itself. > > Signed-off-by: Thomas Wei=C3=9Fschuh > --- > arch/x86/entry/vdso/vma.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c > index 9059b9d96393..ab2b011471e0 100644 > --- a/arch/x86/entry/vdso/vma.c > +++ b/arch/x86/entry/vdso/vma.c > @@ -75,7 +75,6 @@ static vm_fault_t vdso_fault(const struct vm_special_ma= pping *sm, > static void vdso_fix_landing(const struct vdso_image *image, > struct vm_area_struct *new_vma) > { > -#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION > if (in_ia32_syscall() && image =3D=3D &vdso_image_32) { > struct pt_regs *regs =3D current_pt_regs(); > unsigned long vdso_land =3D image->sym_int80_landing_pad; > @@ -86,7 +85,6 @@ static void vdso_fix_landing(const struct vdso_image *i= mage, > if (regs->ip =3D=3D old_land_addr) > regs->ip =3D new_vma->vm_start + vdso_land; > } > -#endif > } >=20=20 > static int vdso_mremap(const struct vm_special_mapping *sm, > @@ -339,7 +337,6 @@ int compat_arch_setup_additional_pages(struct linux_b= inprm *bprm, >=20=20 > bool arch_syscall_is_vdso_sigreturn(struct pt_regs *regs) > { > -#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) > const struct vdso_image *image =3D current->mm->context.vdso_image; > unsigned long vdso =3D (unsigned long) current->mm->context.vdso; >=20=20 > @@ -348,7 +345,6 @@ bool arch_syscall_is_vdso_sigreturn(struct pt_regs *r= egs) > regs->ip =3D=3D vdso + image->sym_vdso32_rt_sigreturn_landing_pad) > return true; > } > -#endif > return false; > } Have you tested to verify that after this change arch_syscall_is_vdso_signature compiles out the "image" and "vdso" variables? If the compilers don't it might be worth it rearrange the code as: if (in_ia32_syscall()) { const struct vdso_image *image =3D current->mm->context.vdso_image; unsigned long vdso =3D (unsigned long) current->mm->context.vdso; if (image =3D=3D &vdso_image_32) { .... return true; } } return false. Making the variables depend upon in_ia32_syscall() so you can be certain they are compiles out. Eric