Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2475383yba; Mon, 15 Apr 2019 12:25:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqwO73hFk4Vd0ynPSaZev+d6FaE37t+Duvwwsn7MAJ+jE7HJs8Ixt7OS/hVdrrFUzKoabNPj X-Received: by 2002:a63:e653:: with SMTP id p19mr70914948pgj.284.1555356324643; Mon, 15 Apr 2019 12:25:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555356324; cv=none; d=google.com; s=arc-20160816; b=O/WL4uUngyuJVQHexB9x1tU0RCwI5YwWM6ytjKHB386MBGMwUJNU3JXLuo3wuhFoR/ 1mhlMkXxz1pmlloaUS3EP9hnOedw0aqElPITR1jzfG9QFFFldiLctVDpCH/3OaYaniLw dG+Y40r+g8oWKZImXEg/8rgE9LbwbuRT2a/JN5mtKWhxgeeoAnc8XywymFuD7SdQ8WOo Wi93JJ1uoRd/DJw1gDyoJ38KFnSHJF1azDUstTsl5wbjhNa6TtgRqb7ziU9oLlHGOo64 ElsGHyrvgPkmm+cD3ClOc2718or71Ki9lhEcQJ/GIMzRYMEfuxXq1ch0pO3iMZQaVOGG YcRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Nlx/3MSggApMB/1FvT9uSj05SNsHRFiCH30LQJouUyE=; b=MS365HU/URd+gItVLsWYw5T/NtP3YM3p/vzXguHeii6zfu6DRgpPhL/dPgvV7fy+bd Ox0pAy/CyOyPye977RGEHViavE8vPVbgbdHtWzB3AO/w+Hx/ckPDfb8vwoXfKMyJA7tz tpdD48QCuhJrC9ZioM6lyNizN9eNTbBfNBMA7fWjZ3ekXSiyKQ8Cp7+SvsRupn0z5iEP tZnvtB4/Lqu6r4FVJvSGRiCY5Nozk/2xO1lQOmID89tr6TFXLuVJvI3dSUmonIBNkZdA f7pWK4E9NNwcoz8QNF0AHVPXcC/ClMbV4OXn354tJocCsib6o/Frlkk9vigrX4IZiPUr CSKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sV9aI0zZ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d39si22837947pla.304.2019.04.15.12.25.08; Mon, 15 Apr 2019 12:25:24 -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=@kernel.org header.s=default header.b=sV9aI0zZ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730628AbfDOTXu (ORCPT + 99 others); Mon, 15 Apr 2019 15:23:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:41892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729325AbfDOTHK (ORCPT ); Mon, 15 Apr 2019 15:07:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 124F8218A1; Mon, 15 Apr 2019 19:07:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355229; bh=e3leF6vlVqZSYxrqXLnG5UisiOXb7Spugo+J8MvxgmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sV9aI0zZHqoIjksHmuYYd/xQLLHasUGaRiVODPsrCvE81kCavbX7OBt9AgLnb7257 cjy/fY/SgJzUhXJsy7V3182rHCVZA+iwoILFVueBCvIzZMFncPutfNPhq/PB/eEvkU cLKRc/AXh4kOoTudMRA0uBxb+odjAoOxmiFzrQX4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Golovin , Bill Wendling , Rui Ueyama , Nick Desaulniers , Borislav Petkov , Andy Lutomirski , Andi Kleen , Fangrui Song , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , x86-ml , Nathan Chancellor , Sasha Levin Subject: [PATCH 4.19 039/101] x86/vdso: Drop implicit common-page-size linker flag Date: Mon, 15 Apr 2019 20:58:37 +0200 Message-Id: <20190415183742.524708692@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183740.341577907@linuxfoundation.org> References: <20190415183740.341577907@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit ac3e233d29f7f77f28243af0132057d378d3ea58 upstream. GNU linker's -z common-page-size's default value is based on the target architecture. arch/x86/entry/vdso/Makefile sets it to the architecture default, which is implicit and redundant. Drop it. Fixes: 2aae950b21e4 ("x86_64: Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu") Reported-by: Dmitry Golovin Reported-by: Bill Wendling Suggested-by: Dmitry Golovin Suggested-by: Rui Ueyama Signed-off-by: Nick Desaulniers Signed-off-by: Borislav Petkov Acked-by: Andy Lutomirski Cc: Andi Kleen Cc: Fangrui Song Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20181206191231.192355-1-ndesaulniers@google.com Link: https://bugs.llvm.org/show_bug.cgi?id=38774 Link: https://github.com/ClangBuiltLinux/linux/issues/31 Signed-off-by: Nathan Chancellor Signed-off-by: Sasha Levin --- arch/x86/entry/vdso/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index c3d7ccd25381..5bfe2243a08f 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -47,7 +47,7 @@ targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so) CPPFLAGS_vdso.lds += -P -C VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \ - -z max-page-size=4096 -z common-page-size=4096 + -z max-page-size=4096 $(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE $(call if_changed,vdso) @@ -98,7 +98,7 @@ CFLAGS_REMOVE_vvar.o = -pg CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds) VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \ - -z max-page-size=4096 -z common-page-size=4096 + -z max-page-size=4096 # x32-rebranded versions vobjx32s-y := $(vobjs-y:.o=-x32.o) -- 2.19.1