From patchwork Wed Nov 27 20:31:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180339 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6650324ilf; Wed, 27 Nov 2019 13:04:03 -0800 (PST) X-Google-Smtp-Source: APXvYqz7RK7uJgpQQAQjFsfbxK9oU5htSbDjJyO9SNNWH+pRV1fWXpvnCLplJj/AHpzIUPCTHDFB X-Received: by 2002:a17:906:da04:: with SMTP id fi4mr31823828ejb.24.1574888643290; Wed, 27 Nov 2019 13:04:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574888643; cv=none; d=google.com; s=arc-20160816; b=b6UBFVnKHTqzlhiy6luHrkCFjM++6slSiMqS4Z3CvTZ4XKiO/eHt+SDA6CMLS0xJ1a +COpBJPJk3UTvm1R0YZo7ro13i/B+7j238sg/WCEMgmgDy+N1tCHPEURn7f6rCYyGxLA PWrJY83UREZUlTKsItjQ0CVZB2pvziWE5oLgHjGQCc4MatisEVz41sfX1SlKo4Axb+1c yzRjL5HDM70I5z7sa6iNdVGobY/tpz1uYDwW/5hsUOiE5NSize+tY699N7r/9E+CbXRc tfzLufgjqsm+uSwTxm4Q5c+Nyw7/8LbmJ3Gvvn0RJDe/9RFR2s9TvStV/H7BIBYTH1tT nEgA== 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=g/2cQ3CxpAsB7+q2aJoGe9Z6yulTN7EvbNz+TlQ1EBI=; b=UrESQMrK8xDLXVB7C0b+KwSIVEER+MAAyDpQ1yhhPDmIrI/USIJ5Kgth6W5CW3Xht4 avu7yKvxelrexGTZe5OnPhnbFoceC5+AFXAlAVoTbxGK/Abelnh4LqemDMGV88kydA28 RLFErhsCJhgVN11xJR4NxuSmcy+MGw8pFdGVFSZTfCXjGC6n7WGyr4JOZKNMyL6BEmgX YX1/edIH5H0rFlEwImvYSUgQosOB86rFaNFpsQDnwqrOj1kEwHLRlwBzRX/DwXTdcyze 3/LKrUh6h2LupHp6HwhkhU1iE0nGLy314gvgmgBeJ5EmL6Y43BLguhMKkO8pr5mO/M3j RYHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T2X+sYAB; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 f25si4359378ejq.362.2019.11.27.13.04.03; Wed, 27 Nov 2019 13:04:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=T2X+sYAB; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731484AbfK0VEB (ORCPT + 15 others); Wed, 27 Nov 2019 16:04:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:57346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732106AbfK0VEA (ORCPT ); Wed, 27 Nov 2019 16:04:00 -0500 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 41F01215A5; Wed, 27 Nov 2019 21:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888639; bh=QvQ27XNzzcAgPS7U8JGTJIggurF2PvKbrINkZNsf99U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2X+sYABJYhsQ0qu1LA59mEwj9eulIJA7PGeuinpNtVLYZ3R9W69DcPzbmm3CJNSu n+UL3lHPxVol6nlX5MMmxzej7Wq+Nl6TUzGdHmurpryha/fwHc/lIoY9k4/KirEUyA JQuEkmO+mP3DOuhC98n8UQsKL5/yzaq0ZgCbGugA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Borisov , Changbin Du , Arnd Bergmann , David Sterba , Sasha Levin Subject: [PATCH 4.19 212/306] btrfs: avoid link error with CONFIG_NO_AUTO_INLINE Date: Wed, 27 Nov 2019 21:31:02 +0100 Message-Id: <20191127203130.607067431@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 7e17916b35797396f681a3270245fd29c1e4c250 ] Note: this patch fixes a problem in a feature outside of btrfs ("kernel hacking: add a config option to disable compiler auto-inlining") and is applied ahead of time due to cross-subsystem dependencies. On 32-bit ARM with gcc-8, I see a link error with the addition of the CONFIG_NO_AUTO_INLINE option: fs/btrfs/super.o: In function `btrfs_statfs': super.c:(.text+0x67b8): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x67fc): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x6858): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x6920): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x693c): undefined reference to `__aeabi_uldivmod' fs/btrfs/super.o:super.c:(.text+0x6958): more undefined references to `__aeabi_uldivmod' follow So far this is the only file that shows the behavior, so I'd propose to just work around it by marking the functions as 'static inline' that normally get inlined here. The reference to __aeabi_uldivmod comes from a div_u64() which has an optimization for a constant division that uses a straight '/' operator when the result should be known to the compiler. My interpretation is that as we turn off inlining, gcc still expects the result to be constant but fails to use that constant value. Link: https://lkml.kernel.org/r/20181103153941.1881966-1-arnd@arndb.de Reviewed-by: Nikolay Borisov Reviewed-by: Changbin Du Signed-off-by: Arnd Bergmann [ add the note ] Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8888337a95b64..ddbad8d509490 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1919,7 +1919,7 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) } /* Used to sort the devices by max_avail(descending sort) */ -static int btrfs_cmp_device_free_bytes(const void *dev_info1, +static inline int btrfs_cmp_device_free_bytes(const void *dev_info1, const void *dev_info2) { if (((struct btrfs_device_info *)dev_info1)->max_avail > @@ -1948,8 +1948,8 @@ static inline void btrfs_descending_sort_devices( * The helper to calc the free space on the devices that can be used to store * file data. */ -static int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info, - u64 *free_bytes) +static inline int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info, + u64 *free_bytes) { struct btrfs_device_info *devices_info; struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;