From patchwork Tue Feb 19 17:01:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 158724 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3891660jaa; Tue, 19 Feb 2019 09:02:43 -0800 (PST) X-Google-Smtp-Source: AHgI3IZOggsSgb9x5INmVs5vLRsNeeni6g+Hz7ul7chITqn4vojKQxEWTckiHiYPB2+mdE7rESBt X-Received: by 2002:a65:4b83:: with SMTP id t3mr24763043pgq.417.1550595763599; Tue, 19 Feb 2019 09:02:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550595763; cv=none; d=google.com; s=arc-20160816; b=lxL0xNAdsEMU5IC5IMEs070dsjXGHpl/0KRVMKFvT5RlfpaGYqzwmudJQ2zpxOZqXS 9yi3AnA6yDjtrdSeRyyj/hKGwlk1VMtj5qcPTk85OvV1tpiG1VT2qlDiPRl1cfMioGeW QR7qWcxIL+DfRrpyA++4L/l6mgo30Vh/8bMJFENRwpPcDbtaurX3Cd7zPShJs2ONOpIQ cgJtbrbfYDWRtxFpP2Xm4/nYt65f01p05gw/5lg4zcYsytkkhH06/BTS06Pb2WP7k3YJ vUKKR9a3VFm2b7uplhjkmGyZX5mmrykJMpmg17IgWPZ3PgpiWyCJKidK7stVZ56e0Rc5 uLqQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jqJ81/GD1xuVTEoMvATVw+E5IibXvsXhAgWxHz1EGjc=; b=tPLcvbh6d59VkiSAQSnOcFbbUMeyMIqGHtCtNUVEzBWw46US8pl6yYeTai8Q1rf3tQ PtJSQLK0Iu4q9ji+WUNWhveaL9MFjxFWvgwzXtnV0f7KE/VLKjcBm5mWQtqt1YbipoYj wCFAV4ug550n1pedVQwqc3fr/jSYTMgonLUvs3i4BXa9AYpJbWrIPgY1MkRE93J7zxGN 7ZuxLS8JuBTwKkHn27OUSeXB2YEzmJBC7ly03n4VArsPd6mSz3wXD9rpGeiQ0P08UHa8 iGvVxJBPtqlQbkGVmbBSkSHA1iVIbh3xQtSOC2XtXklc7s0W/PEVW0GUt2EtY/NzI2ni gc5Q== ARC-Authentication-Results: i=1; mx.google.com; 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 f1si14823535pfb.282.2019.02.19.09.02.43; Tue, 19 Feb 2019 09:02:43 -0800 (PST) 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; 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 S1729305AbfBSRCm (ORCPT + 32 others); Tue, 19 Feb 2019 12:02:42 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:41431 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728086AbfBSRCj (ORCPT ); Tue, 19 Feb 2019 12:02:39 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1N1g3U-1h2v7v0rTE-0121Q1; Tue, 19 Feb 2019 18:02:31 +0100 From: Arnd Bergmann To: Hans Verkuil , Mauro Carvalho Chehab Cc: Nick Desaulniers , Mark Brown , Nathan Chancellor , Arnd Bergmann , Dafna Hirschfeld , Tom aan de Wiel , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] media: vicodec: avoic clang frame size warning Date: Tue, 19 Feb 2019 18:01:57 +0100 Message-Id: <20190219170209.4180739-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190219170209.4180739-1-arnd@arndb.de> References: <20190219170209.4180739-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:g3znxI/S5xnDkg9Wo/D5wh5t5Hsi2OmQeyEHXvKEecfS9DuX84+ nY1feFvodvSCf3T+Iq/YOia9EwfUqYXvmR7TgseZOfxNmKk/1XgqE5pPLzwWEYQkmqC+h+J TpRBpS5grwf9zvHmB3wkDZc4pG3yk1uzCQ1ymjBWJIS0dEPFGKE0LbK3zMdoiY5He+dQTDI ogBqLHSjrrQVq8o0FnGZQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:NjfAPwaaOKc=:GfqSa4Qkn5dajg+UW9UJm8 xhxtplujGY28bIVix3xacsMgHfW0xT0G/CV9Vf6BDeWkUvUiSYvfOYeZOlx05igtmixda2MoE v0NajU7//WYKQj5X+D4ZgJT8+i1mKIgAYM8IURdJhhNreyrWghF/CK+w0WJOPQKEN2Xk8xpVt IRfaiQFkSRZw91at/GguaxdIXM6u7l88aWRiWskbb1e0CyQMuzj80lkwLI62MYYkVtT0FIYRX bv+EFnUVrmUSfZetZyirHIuc5B/fzbs4cnlLZnmzhIMuo50gq1J02TYmFnvUD+xaRfGowkJw3 1pDsCqr1Zhrhi19w+EKmmQQLQZxIClV6urxEXlsVsrQW05vfxynwJGDtZXDE3JpqQTQ4DJeFd aYlBb+EsJoIKZXQu0GhHq8y5j82tGDaVDWpGgQiD72bBOllq4aM1iw2bkC5ION0JrR0+IYUFy pP07acz9PzNeMWGdL18fIpZAH/7LwrAwcFlZli3mdldlfHnkOA/fhU3y4WkHdiixUkRVTD8Pj m9+DKUQ/+59dCxLYi7baGl61636ttT87d3LuXyyp+JcVg3posMFSbExp9cUnVtRjdXgDHM3fS IiEiX8IXfVG5/odYvO+e0HmtBZyx7iwZYecLbN1Yr8Zcqn1Yqghlp9pJEuPAMA+dT9z+K/zRz c02B/dZcEyDvEVyEIe8c0NI3cGjpVDp6PCWdHBIhVTGi7+j62tAfPYi2pM6xAff8lv+B6M2vt Oh2TOUGeLFsPHNy/pe2EzpK8VOLhPmtaImUnHw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Clang-9 makes some different inlining decisions compared to gcc, which leads to a warning about a possible stack overflow problem when building with CONFIG_KASAN, including when setting asan-stack=0, which avoids most other frame overflow warnings: drivers/media/platform/vicodec/codec-fwht.c:673:12: error: stack frame size of 2224 bytes in function 'encode_plane' Manually adding noinline_for_stack annotations in those functions called by encode_plane() or decode_plane() that require a significant amount of kernel stack makes this impossible to happen with any compiler. Signed-off-by: Arnd Bergmann --- drivers/media/platform/vicodec/codec-fwht.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -- 2.20.0 diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/platform/vicodec/codec-fwht.c index d1d6085da9f1..135d56bcc2c5 100644 --- a/drivers/media/platform/vicodec/codec-fwht.c +++ b/drivers/media/platform/vicodec/codec-fwht.c @@ -47,7 +47,7 @@ static const uint8_t zigzag[64] = { }; -static int rlc(const s16 *in, __be16 *output, int blocktype) +static int noinline_for_stack rlc(const s16 *in, __be16 *output, int blocktype) { s16 block[8 * 8]; s16 *wp = block; @@ -106,8 +106,8 @@ static int rlc(const s16 *in, __be16 *output, int blocktype) * This function will worst-case increase rlc_in by 65*2 bytes: * one s16 value for the header and 8 * 8 coefficients of type s16. */ -static u16 derlc(const __be16 **rlc_in, s16 *dwht_out, - const __be16 *end_of_input) +static noinline_for_stack u16 +derlc(const __be16 **rlc_in, s16 *dwht_out, const __be16 *end_of_input) { /* header */ const __be16 *input = *rlc_in; @@ -373,7 +373,8 @@ static void fwht(const u8 *block, s16 *output_block, unsigned int stride, * Furthermore values can be negative... This is just a version that * works with 16 signed data */ -static void fwht16(const s16 *block, s16 *output_block, int stride, int intra) +static void noinline_for_stack +fwht16(const s16 *block, s16 *output_block, int stride, int intra) { /* we'll need more than 8 bits for the transformed coefficients */ s32 workspace1[8], workspace2[8]; @@ -456,7 +457,8 @@ static void fwht16(const s16 *block, s16 *output_block, int stride, int intra) } } -static void ifwht(const s16 *block, s16 *output_block, int intra) +static noinline_for_stack void +ifwht(const s16 *block, s16 *output_block, int intra) { /* * we'll need more than 8 bits for the transformed coefficients @@ -604,9 +606,9 @@ static int var_inter(const s16 *old, const s16 *new) return ret; } -static int decide_blocktype(const u8 *cur, const u8 *reference, - s16 *deltablock, unsigned int stride, - unsigned int input_step) +static noinline_for_stack int +decide_blocktype(const u8 *cur, const u8 *reference, s16 *deltablock, + unsigned int stride, unsigned int input_step) { s16 tmp[64]; s16 old[64];