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 44AA9CD1284 for ; Wed, 27 Mar 2024 12:18:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BAD8D6B008A; Wed, 27 Mar 2024 08:18:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B5E1F6B0093; Wed, 27 Mar 2024 08:18:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4D786B0095; Wed, 27 Mar 2024 08:18:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 86A956B008A for ; Wed, 27 Mar 2024 08:18:41 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1E33180CFF for ; Wed, 27 Mar 2024 12:18:41 +0000 (UTC) X-FDA: 81942722442.21.C6D5FCB Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id 5A7C3180016 for ; Wed, 27 Mar 2024 12:18:39 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="MQ0/AQDV"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711541919; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=4pw5oPlWf1G0J4uM0tdQTfzRavjqHBe5h6hYBRNI+W8=; b=ZnvT8iZQD5k+YZRUF5+zKY/ogTA4SgAJLkCGaW5BBRz96me393RBd6gSfuToXaps1xbNoE cqqFuboZmxY3trnu7FuFUqxs+RU0VGM8La9uuoco1MJBEZQD6XKOUoJt94/VYtVILOyujG 15EJcQ6DOFHswDNwGgLaT69YcXbF1TA= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="MQ0/AQDV"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711541919; a=rsa-sha256; cv=none; b=kIx2RZeLpWnBje1Al1JFdz1FBCju2pkTVaY5bExZd0qJLVnnFdA3f3S3f/+PNMhFCUtUJi ncmf4bT0XSZoUxgLnLxewNfK7nYnSd7FuONB3YaP51XPS31no0hZKF6e9bc5J6Ud17NYzC goQQeiNSl2FfVB/E0u8M9Rx2p/gpFDU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6A6A961515; Wed, 27 Mar 2024 12:18:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E269DC433F1; Wed, 27 Mar 2024 12:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541918; bh=nyDkxAtoumz6NapNC3ssvGii4GjOv4f2Xhot8O07yaE=; h=From:To:Cc:Subject:Date:From; b=MQ0/AQDVZpvUPIRzwLmMHUtIr9bqDDfn9P6vqdRqnICn5X+wPtNIVJ5twWoj+wGnR qwEKRq8t52Amp2iHl0k+zqmHo6Ly0KDXKhTduHZWU1PMypLe0+OV2TqUun7LT+3Wvk fPQ7chZb99nEj5/6LOJCwc/LzzJe5+MM9C4whH/034w66PM0kNPwvDf8L7T9qWWQBe CsNY+qNBEu/bdVH0cDAe91q+e0QJ/v+O/7j8+PLvtTTIKZrt+ooc6BJtr3AVbzo4Co igYJVKzeTQwj0vw7Jfs+8MyiqAM/qwMkpk64a8PkDyZAfpDUTv5cfivTQg2MVCLVRJ sKqhE8gtt1pTA== From: Sasha Levin To: stable@vger.kernel.org, chenhuacai@kernel.org Cc: Xiaotian Wu , Miao Wang , Xing Li , Hongchen Zhang , Rui Wang , Huacai Chen , linux-mm@kvack.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: FAILED: Patch "LoongArch: Change __my_cpu_offset definition to avoid mis-optimization" failed to apply to 5.10-stable tree Date: Wed, 27 Mar 2024 08:18:35 -0400 Message-ID: <20240327121836.2834515-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5A7C3180016 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 3j4zi4a8q3iqnu8gauxoz1c4raggj9an X-HE-Tag: 1711541919-978980 X-HE-Meta: U2FsdGVkX1+Nq6eMuJNKPdTj7JX1iOiAlLVaCcojPBWMyAfqnKtEw1Y5Chw66i86utBFEOANNAEmaFYn60Dy4apaQQKLqmqnKGgtBWG14A0K8Gm/4p4q6fQ0CCyuZ8Q0+WXfYsXsKvOIO0BRYnaivVlLgum1n9Ss2h2LXMzt3XPlbqSB6Nv0VbCskS/bJK72TJfZhdGCbwWd12Gf/Fh69SVF0WUWUtQoENmtUsOV6oI7PhGBdQ4xJ1KRgRbaYE/nUiNGZq/MZVXwVki9mOLQgOukpEdtBkolzj4yulCbgtEClwHFB7zrvjRv38bSTKXNRPhmCR62s6LORfN2PoHVOy9QYhfGkZpF4BmSSkX4Hot757jeB2xroFOSXG6eX1zaX9hy6cPmQDV/mdqfTvDNoy9TuT/xHRyGjUqEiGvfg83d+YhMyODovhwT8U18y9UwpBp7DRHidXhjEnXJAyaSaTaq90yaeWBxv/EVMou0rMhiWoQrXwIoZoj8OegPDhZyqNycEWa+qZ6YqHs9paMoOB/cy0a8kx4VZAujykFNCJpzWAfsWw5LGlUjyyYns1n6AYa7A09KRGlCP4iS1ccXlvZvfzWjU1dzZPt7uzBdn+YkrR8aWWo1svItbuxEAV7P6r8LqRusaHhCqfPxAR5ho62ELxGn31+Uo1uvehj+VJ9aXPxVlhLYXosN7Ql5+pvhZWyhiKsV0W1hiO7Sp1zsgxRgW9yUzC+1ckHL0NItarz6WYjcz9INcGCMHLORvSENWxPPsI0kjnq+RM7Z9ieQKxq6uxUtYs1wxXKPJJd1FHFwo/bbeXwY6LX8WJmEeAELi4Ami8njRqRhptFh2FgkgnIOSbmGIMZuANhuUDJllEfeAuka/C32UHS4wLGJZI5SGT8gLqLJGRSzOAxNPGWtZASGu0bUvpz6TG/EN66qqZIy7zOdskS7tKpi72Mrhk/MiaWj294DgWvFKUTHNSw NrpEGwQw 6hNrXRMtjy13QEv+Rnn5tqlXqkp1l50Qs7zeC+tn0QxRoG1lQQP1RnYNcDkJVb8bdNXdxLQffudFTzpKiWpBALJNz36RdzFraidzIRdAhZlJqnqn7CcFMXro5flx2CqBaIVkxCvz4lvs1efRAoj4GtyHSdRwm47yfjzW7l8u7s11T9iwIEv6skH8QpihqVWAXcxLIdFGMg3+KWx84a/PlQwW+8L4ho0XGSWUDdEdC5iaitUr8Nxa8a9bqEgG3xG0WcaiL+TvIurHHzcVTqiNIOYaKK4SMVeM5BMZDuKlEeNg4CmOdmbDrpYnVwgbZMuF5pSHkswluRYCFn4bkolEML1N7IA== 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: The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From c87e12e0e8c1241410e758e181ca6bf23efa5b5b Mon Sep 17 00:00:00 2001 From: Huacai Chen Date: Tue, 19 Mar 2024 15:50:34 +0800 Subject: [PATCH] LoongArch: Change __my_cpu_offset definition to avoid mis-optimization >From GCC commit 3f13154553f8546a ("df-scan: remove ad-hoc handling of global regs in asms"), global registers will no longer be forced to add to the def-use chain. Then current_thread_info(), current_stack_pointer and __my_cpu_offset may be lifted out of the loop because they are no longer treated as "volatile variables". This optimization is still correct for the current_thread_info() and current_stack_pointer usages because they are associated to a thread. However it is wrong for __my_cpu_offset because it is associated to a CPU rather than a thread: if the thread migrates to a different CPU in the loop, __my_cpu_offset should be changed. Change __my_cpu_offset definition to treat it as a "volatile variable", in order to avoid such a mis-optimization. Cc: stable@vger.kernel.org Reported-by: Xiaotian Wu Reported-by: Miao Wang Signed-off-by: Xing Li Signed-off-by: Hongchen Zhang Signed-off-by: Rui Wang Signed-off-by: Huacai Chen --- arch/loongarch/include/asm/percpu.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/include/asm/percpu.h b/arch/loongarch/include/asm/percpu.h index 9b36ac003f890..8f290e5546cf7 100644 --- a/arch/loongarch/include/asm/percpu.h +++ b/arch/loongarch/include/asm/percpu.h @@ -29,7 +29,12 @@ static inline void set_my_cpu_offset(unsigned long off) __my_cpu_offset = off; csr_write64(off, PERCPU_BASE_KS); } -#define __my_cpu_offset __my_cpu_offset + +#define __my_cpu_offset \ +({ \ + __asm__ __volatile__("":"+r"(__my_cpu_offset)); \ + __my_cpu_offset; \ +}) #define PERCPU_OP(op, asm_op, c_op) \ static __always_inline unsigned long __percpu_##op(void *ptr, \ -- 2.43.0