From patchwork Tue May 9 10:04:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98889 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739385qge; Tue, 9 May 2017 03:05:13 -0700 (PDT) X-Received: by 10.84.137.1 with SMTP id 1mr2949494plm.128.1494324313804; Tue, 09 May 2017 03:05:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324313; cv=none; d=google.com; s=arc-20160816; b=sV/Z7OWOIJcqYsEEfi0SR7wqiK4QpSh23v0LUjpnZsQ2hU8v9E3g8Ma7dCLSjvlvl4 16YWC3z+w91PBKDXpCwZBpiIMDa51e8X7vMSxuZm0zaYXSFOOZ+sTq5s8SvzKxyApRgL AbSEkEk7WoL1dQyXERcdIMlgCyEVKByRlGHbGn70FDiGFfy+55S5TfqSgnHakuhJQHGY /QaWh0i+2pVAPYu+RVuHEn8vDbNQg3/U9bu66RL6LZ4WqQbNYCcG1Gd69bLmVO14h/0q es/8O8wBg9xWUyHbTTAFgorwCfMNwxVzpWjXuwmZBuUV0TcCoDZ3j4RDrgjHOHb2YfMf iSmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Mx6fi5Ucgi8gK22VEWNqdmANr0vKN3T7gMY376KAXa0=; b=fty3Cp7H0Irml9Vm7SVyRU/UEIlOkISJ8iBF4laCD8Ngm9IAkviCFdIJHFDzAJCCvV IgD3VJXOUcx9AsKdRvnb55thK7T6bkrTZPYcVePbtmCHeDJx+tGY/D+8BFoP8ektJ67H 0HNad74o3lM5eREDVT8vKGWp5mvykG1GyrICwMpO5Sd5ni9hY4IUa+3V6y2qp1XCi3gM /WXsNSTLOHfwkn0/3Suuu6k4coQCQqpXgfP6rjDNHRQNztxTDnPQsKfThh4gY4d04Sxh D1lNZEFv5enKZlSBOgq8KCJwki2Ez59scCfN39F7uUY6LibRW/uDLPfTc/JHmiSvKonC aWSg== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.13; Tue, 09 May 2017 03:05:13 -0700 (PDT) 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; 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 S1751657AbdEIKFM (ORCPT + 6 others); Tue, 9 May 2017 06:05:12 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:60750 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751216AbdEIKFL (ORCPT ); Tue, 9 May 2017 06:05:11 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MNPzx-1d5Y6f258b-006ycL; Tue, 09 May 2017 12:05:08 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 01/14] staging: r8192ee: prorperly format warning message Date: Tue, 9 May 2017 12:04:49 +0200 Message-Id: <20170509100502.1358298-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:pBaOBdwLuBxwYwEw0MAEOvXC4gdpMTn9P3otsnrhSIw3Y2tKKkT RqImzCQbZOR3gQ+3SgFfZCLwwjZq/8BUCXNyosLrdiZHKYd5sry6rvl1Mra1E/xisVlQ1mY kbK6v8dTUhqYitMfmg1blcZQ2nuWcHwno0jjPB/iRU2TyYm5B9c0KX3xD0lDkPNpZ4scDEO aTtQPti1NtXuIjVLYMadA== X-UI-Out-Filterresults: notjunk:1; V01:K0:2K9pSk3zfEg=:WdRSV40bVuq2j0d1YuFnGb U0ahwAPWs4dOTJPQBYUV8Y6FSwnRcQoAkPNV9J3Hq9p+/mmTYIRWSHplvT20uAhh3pPZMthzb 7oU+8HFh8OV6aONrjxHaTI4Tf93XWSD4OCj0f7gIiRaS3id1uG2f3mvjciJfJ2J7tvkEdx9gD SYHPGZgiL4kBAQIQaAY9WEdQITVHFEZ0HmTaY7r/2b/JO7dx9+DMkt3kdNyJCX3ZUC9vh/e4X c0Jlhgh9Ye+q8Y968CP4FQVA4qr6g9mjqqwUEc/SgffG5N4adGYPJy7mgfbSauPT3Y+E1X/ht zGhboFJHwdsUAJMuQTz2kw8titmviISaUFCqaRHyikpBHU9DCR5+K4Ib7R/OSJGPvZjkmxTy4 HCwWyn6xw2Y6pHta7dyEXnCzB2Ol7zX2ke3B+8R1gAbUnshIygAuyURNMlT5z3O2sEiO5lB0m WLPNxWdvdn8KaNPIh6doegHC7e6Adp4+P+iVBiLJXKWpJDC7l8QMAuL+uEaC/pL02OhNNjZYK Uo7KEp1JVIYw+HP3oofK5TaWeTZoe16HvtOQ1Af35JtP6a0bTOiaJRDlYUU1L5e6HA5ks/FXz fAKE6O1RSRkDmDiSC9SJzlHgAt63+jkQuRMHNnQQkBwdRWHo+kpFz3+5RTre/7inIvEYSwdeh y8MXL3pTXkuDe6+ro3bnYZOJ4i5xiRsZhosPf2Qm2F1REbX1t/IPTh2Sd2Dzy+zM70+4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In stable/linux-3.16.y, we get a warning for 64-bit architectures: drivers/staging/rtl8192ee/pci.c: In function '_rtl_pci_rx_interrupt': include/linux/kern_levels.h:4:18: warning: format '%d' expects argument of type 'int', but argument 2 has type 'sk_buff_data_t {aka unsigned char *}' [-Wformat=] include/linux/kern_levels.h:4:18: warning: format '%d' expects argument of type 'int', but argument 3 has type 'sk_buff_data_t {aka unsigned char *}' [-Wformat=] The driver was removed in 3.18 before this was fixed, so there is no workaround to backport, but it's easy enough to avoid the problem by changing the printk message to something similar that uses proper accessors for the skb fields. Fixes: 78de2c063710 ("staging: r8192ee: Add source files for core driver") Signed-off-by: Arnd Bergmann --- drivers/staging/rtl8192ee/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/staging/rtl8192ee/pci.c b/drivers/staging/rtl8192ee/pci.c index 3fe9b7ba01d6..1686b360e088 100644 --- a/drivers/staging/rtl8192ee/pci.c +++ b/drivers/staging/rtl8192ee/pci.c @@ -882,8 +882,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) } else { if (err_count++ < 10) { - pr_info("skb->end (%d) - skb->tail (%d) > len (%d)\n", - skb->end, skb->tail, len); + pr_info("skb end: %d) - tailroom (%d) > len (%d)\n", + skb_end_offset(skb), skb_tailroom(skb), len); RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_EMERG, "RX desc\n", (u8 *)pdesc, 32); From patchwork Tue May 9 10:04:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98890 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739391qge; Tue, 9 May 2017 03:05:14 -0700 (PDT) X-Received: by 10.99.127.80 with SMTP id p16mr23146387pgn.180.1494324314574; Tue, 09 May 2017 03:05:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324314; cv=none; d=google.com; s=arc-20160816; b=jMpzRd0uCIQsbBW8hdqGvApECRXEQmNlkfVajkMUDzpbLpyDWumUXC+GRK8KF1NtbF 7e6RmyFVx9XhIIxwSTCo5D9s8wHJswZHOP/IHhd9ISStpSXHYkAeTQ+CCuHZQ8El1TYN hgq4Q5Zpt57MM6ecsBswBQUdWKzPaZJgmNCc+BP7wjghY4ySRItwE7xC1UimP/eh9ebA a5UDlfQDdTVcY3fhsEiKwag3BPaAmZgmbc2QXLePnLCn2qqS9vhCBUV9oB+cLY7tRRL8 n612LxtLHtIxUpkd4bFyf0ntRpQw1wTuxea97kI0I67HIxFvoMCfBfQmE284UGx75ydD fB/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=LkcYtdL7teUMfjgcwC4RO6yDBhGcYM9llDI92shaOmk=; b=0d1EJrjg6SYkwnJvTOAzRhEIaW3Z03qBdUEGyoS6++fysunqLWR0L20ja4TMW/dozh tt7LUAfTS5Swsa8kGoDOsetJ3/ndoiHpZCek5o8/gLOyuibnNKfey0eCBvQ7QpcKjJsO 4sEq4Z1LFOkF/revPJKwK6YrKSAnWkQv3A8oR5aQndf+edsABc3X2xzANiFqXfnSBI09 2p0DbAOyWsaEMI2oTUj7v+4IBsF+TDt4qFKFUQcqo2qvbNoPbXrKC3hH/IrGCvGDA1As h30Ife1EZWGzos9vKvGadI/2GLAFmvR8n18P2z9zAG3tM0mJE0o2U69nPMWmjG9m7pqJ 29iw== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.14; Tue, 09 May 2017 03:05:14 -0700 (PDT) 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; 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 S1751216AbdEIKFN (ORCPT + 6 others); Tue, 9 May 2017 06:05:13 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:62307 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751295AbdEIKFL (ORCPT ); Tue, 9 May 2017 06:05:11 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MhPzK-1dLplm2yUk-00MatG; Tue, 09 May 2017 12:05:08 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Brian Norris Subject: [PATCH 3.16-stable 02/14] mtd: cfi: reduce stack size Date: Tue, 9 May 2017 12:04:50 +0200 Message-Id: <20170509100502.1358298-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:p33shbSZbkBjh30UG0O42dRhakBbS2c1Uaaivrgi8NI9WOE4dLX 3pAMgMSMr1tipeFX9G2WbaYMWWkPDU3PiS+w4+etji20hYIU9H1uKkM7Ftz1ZL0/6wu8DQr YKlcA6UOrxa33fd1/c2p209bDevGXNsqZVS87lQwew+/lejnxfvYGU5x0dpcIaag3IYzxxQ +/2+43hmcL+dRFKgQijwg== X-UI-Out-Filterresults: notjunk:1; V01:K0:HqS7Duu7VXM=:i0b23xTqrK2WPuXn0KN2Pg t50QkE1edsHuWlPuaxzEIl2lejfHIlX54RwrT3V/tb6g8l5n+tB5239Zmmzpbd0VueJeFYZph J3lyNNKSR9VvaGkngxuPa5dF5aPzDjsID3KaNn7da2sZF1NJDXy8TxuCyLQ1Cy2S8q9BY5opG j6foDdAbvjl0SWgAqlhnyZZluNTVlom08n6b6Vb40i3VvnERb+iGbZ2zjtqoLSRcEtyZCHHt5 oFASnI2vlCe5vSlYJftrvG15eYG8dzYVXdl0OjMbeJdJr4THF0lpDsKoMNK99G2KV6ozmnHWc L8mfrCTQmj6theX3iB2bUEXsizPic4UnElU5bSbjd9Q8INSaUCaqzz/5pUdrBNca4/wuiosDO BVMmdwxEaRTYD1/m1ots6OWek1bReZg002O5/Qk/dQI8Ep7tznxynjB26kJYAmW+dIUsEnz8C 3P9ciLnzLkNmDOkcUiXiDMvLIx0sDJQqUOd9FKS9aAm6sUDnGEoKMFPWuhEFkyMv7udkRotzN rnlXFLDcIO6UuJCpl7rrRn9t45jVdI0b5IAV13D6LaAP75I/HBGYqS15J+pNimQ1k7OAVYODr XKGqqWXUZGmNm3CeUJGrN/G9PcrO3ubSW1bJNFBFY0DojFcJ0ZyhJZDxLj+rIH28p/HvRCceX C4GOEn0U2LMPI48Mi6rWDC05/7B+xQvRUZs+2uAAktM+ZtJn1paGqX2NkZrhowH5u8Jw= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit d09957fbb4d0b059b3176b510540df69048ad170 upstream. The cfi_staa_write_buffers function uses a large amount of kernel stack whenever CONFIG_MTD_MAP_BANK_WIDTH_32 is set, and that results in a warning on ARM allmodconfig builds: drivers/mtd/chips/cfi_cmdset_0020.c: In function 'cfi_staa_write_buffers': drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1208 bytes is larger than 1024 bytes [-Wframe-larger-than=] It turns out that this is largely a result of a suboptimal implementation of map_word_andequal(). Replacing this function with a straightforward one reduces the stack size in this function by exactly 200 bytes, shrinks the .text segment for this file from 27648 bytes to 26608 bytes, and makes the warning go away. Signed-off-by: Arnd Bergmann Signed-off-by: Brian Norris Signed-off-by: Arnd Bergmann --- include/linux/mtd/map.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index b501e9cd7d3e..db1dba23aed2 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -317,7 +317,17 @@ static inline map_word map_word_or(struct map_info *map, map_word val1, map_word return r; } -#define map_word_andequal(m, a, b, z) map_word_equal(m, z, map_word_and(m, a, b)) +static inline int map_word_andequal(struct map_info *map, map_word val1, map_word val2, map_word val3) +{ + int i; + + for (i = 0; i < map_words(map); i++) { + if ((val1.x[i] & val2.x[i]) != val3.x[i]) + return 0; + } + + return 1; +} static inline int map_word_bitsset(struct map_info *map, map_word val1, map_word val2) { From patchwork Tue May 9 10:04:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98893 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739415qge; Tue, 9 May 2017 03:05:18 -0700 (PDT) X-Received: by 10.99.127.26 with SMTP id a26mr4227833pgd.75.1494324318432; Tue, 09 May 2017 03:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324318; cv=none; d=google.com; s=arc-20160816; b=qtTjtfFtN4dmw28sQFz/5CfNtvv3iYmKRNUz8QQGg3Aaw+nAwDPFGINE8BADpe5RVu 0s497RAfQu4AYKKtsLyzASKst+pNbkBPgdG0atMCI7FD4dGSstvNGc6pgV3QgO+uW8y4 jomoo844FlXrFv6kcNpH/91vuquOHD+SkKzRC+1b0k1cfKf9I1s9k3p0YPQW6MVzgDtf /vXgIIf/ZFP5QJG/OO7lPnVPyCTSYHoUS8HOPKDxfqMGxkMwws3RseWNwknmh0TNEThx tVKzIfBW5GJ9QJothDwPylUojXk8aIrhRNPS6NZJyLfKghjNMp2tSrpjyK1dN9RLBTGv 2CvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NjSeKpd6ZcOvVZbcYhEr2DooNG5TPOnk0qulICw61ZQ=; b=fO82gRc5pQ2gMK5tyIDcgfak9avZeioqgfs8ElTX+Z2SwWtJB7wgOH+Q3r+43oohCR WdQuUqdWqVc1blGyMOBdKl+a0VYJxngT2w/+Utdk0+TzK3Cx3werHRif0KMkfG8NRbmB eixIOGq+1wmErxYOx2a9TLWmdEBUC8mgo/YwhkHRwGNSNujPLBC8FStJ2SNb7JsLYIY0 yMcxvZxoPMCk11ZYc8F8/PPvfnjM6aSGbdRrMjl+BC3ZIjIXJ8ANeZZiAUr0jEAfc71T 2ku5BfuLEe/wwwd8N7xW47dmcTuHG1QTYiiF2rqpFmUw+njd2Waxzlv2hQ8BBr/PC2BS saKw== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.18; Tue, 09 May 2017 03:05:18 -0700 (PDT) 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; 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 S1751203AbdEIKFR (ORCPT + 6 others); Tue, 9 May 2017 06:05:17 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53636 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751295AbdEIKFQ (ORCPT ); Tue, 9 May 2017 06:05:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MTtCv-1dYG723Wvh-00QhN3; Tue, 09 May 2017 12:05:09 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Lars Ellenberg , Philipp Reisner , Jens Axboe , Arnd Bergmann Subject: [PATCH 3.16-stable 03/14] drbd: avoid redefinition of BITS_PER_PAGE Date: Tue, 9 May 2017 12:04:51 +0200 Message-Id: <20170509100502.1358298-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:idEAqQ6FshTaSfqahKex5xhWBiSv497XvgHMc2JJQsZhO6YvF7n w5D9dTNOKZKG5N1Q2dvzYUdRQLUVQDwoK82n/djgyx5OOIrWKtm7hceWVmTAuSP+7Ggjffg RUvT/rWoZUbwzpQwX8tWk6Oon3u8lQg3RB8VqwXaCjxc8mYmRcq+VjqzfFiGU1npvrDo4K5 KTOjCr3fwqtE7bEkXNX6A== X-UI-Out-Filterresults: notjunk:1; V01:K0:acQuKuFUwhs=:wq/F108I1HaTSCwwHLW78Q sDrDw6WkT4H6TgLRIrO5/h5u+IcM9ODA3df1aIO3V/mUeLQf3KMTimk0QfXPXumYNAeo+vMAf QeEg6InjHGzRO1A45OvuSGbFEQwkT5hmMyTSslXKvjybcWxonOXcEW36hQBGO05q3n+Fzb5qr Msc8IctDt11xuNj4Y3BJ/6YVtYxjfDAJstmn5UZ4M+cujMkMe7hYq14vXXQu4PQ7AJN73Q1Yp fVeI5kAHFxUgcnZ3nHNasKWcCWjAUHZJkVWkRskG7Hm3O1Jw91IQ4nfS5gxUyyy3fdV/TbzvZ QBMl/265zRVItMy0FPb75nn7+RIk5JehtMZ3b61dwG+i0fO1RoBhJ0HyHqetfEqd6yNJM1KFs bgUe4R7j6fVWERf3uEK5MsPwd6VHY50+GW0KElpBMcAp9R43JuLwe6FXfPeIzdzrtjp8UPynR yyPRkHRsiWqoqloJqQ/LBzNSz6bNsxj2+vPZjPLCR6PYT3bj0ejvcIKHfUVRxyqAifWvq8/es DVr1s8E1RyyRDW8z4reUZs7yUW2ozPYGJTmJNEP90CDBYftg/UM7zQEREEaiHK5ZwHRMCMi1Z 9F0Fn5O6FD3pwBgUtpVpEDnRDvZUjO0YH/k9mId8LtmmlDO2lbDhjlP7Ly97gcUGuhcpByj+j QryKHQklVd2sJRykbbXAbYP9Po5XxJNDW27omQYJgYsBlXUNegLi8B40sWNg+NUAmT4I= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lars Ellenberg Commit 2630628b2dbc3fc320aafaf84836119e4e3d62f1 upstream. Apparently we now implicitly get definitions for BITS_PER_PAGE and BITS_PER_PAGE_MASK from the pid_namespace.h Instead of renaming our defines, I chose to define only if not yet defined, but to double check the value if already defined. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe Signed-off-by: Arnd Bergmann --- drivers/block/drbd/drbd_bitmap.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.9.0 diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 1aa29f8fdfe1..7c76f7270bec 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -478,8 +478,14 @@ void drbd_bm_cleanup(struct drbd_device *device) * this masks out the remaining bits. * Returns the number of bits cleared. */ +#ifndef BITS_PER_PAGE #define BITS_PER_PAGE (1UL << (PAGE_SHIFT + 3)) #define BITS_PER_PAGE_MASK (BITS_PER_PAGE - 1) +#else +# if BITS_PER_PAGE != (1UL << (PAGE_SHIFT + 3)) +# error "ambiguous BITS_PER_PAGE" +# endif +#endif #define BITS_PER_LONG_MASK (BITS_PER_LONG - 1) static int bm_clear_surplus(struct drbd_bitmap *b) { From patchwork Tue May 9 10:04:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98891 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739392qge; Tue, 9 May 2017 03:05:14 -0700 (PDT) X-Received: by 10.99.50.66 with SMTP id y63mr23336211pgy.41.1494324314884; Tue, 09 May 2017 03:05:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324314; cv=none; d=google.com; s=arc-20160816; b=E9R7CYCLtzJg8ly7ocX3UN1k4UBNLy6kfu4ZlibaHsPGywpE+/awKNs8O+K3TI5Sx/ HHk8KRjwGSLk0TssZRJlFxq5FzalqvA6eJQMaxqD+ihGBpoDeKoNECxKfrN/yd4rDO1v gRaCJg7iioZ3rxYblZ0IV6P7vfaXBwzsvYrhEClh6ncmCzzn0/06FUeQbrhQ4DYOYlxy +Mb9t7DoFj74H5vAqi+8KyZXXoPATm78TyPD2XWksCjGu6wcO/I+LJW9FLv1cCCwFncP hvtPTls26Vvb4xaYkqNU87Bp6DQcwheiP9mrTG7KzonR2f48kckm0n6DHgb/LmWqwzdI yzvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=fmHGaFUxx0Yg99hwjM0JKxTCintH2b2Q9FH/jxw1TWY=; b=rVzQJ5Ke/ZInOY50j4GRGNnuVJG3xD2Ldm8Ojp05peeGFz27ehlEEHU4a7Ngd6EluK pKW261TwAMGvdytpfz+kgE18vkIF8042Ml/pFRrsCeziSxrXpLVMlccimKCb3cKnz66h QF8yFRwB5C/QT82ICisI7ktSNQXaS4Ibkc3q9/7HVQz1IYl7s4qZl+zv7hEkdPLejAZt g24TsowWwYOV52sIn9k91NhnuoLSvoJdg7dXQU6Vbbkt2M7LKIbQAeMTZmE4PCfjoBIq 4PJfV75TL2w153FKWwmmm2niws7UlH5wZL9cTPpV/vSATxF62p8pJWaLx6Ba1XJnQhxU nszw== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.14; Tue, 09 May 2017 03:05:14 -0700 (PDT) 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; 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 S1751193AbdEIKFN (ORCPT + 6 others); Tue, 9 May 2017 06:05:13 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:62273 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbdEIKFM (ORCPT ); Tue, 9 May 2017 06:05:12 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXTpy-1dVlOy0MCs-00WSnO; Tue, 09 May 2017 12:05:10 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 04/14] MIPS: ip27: Disable mpt2sas driver in defconfig Date: Tue, 9 May 2017 12:04:52 +0200 Message-Id: <20170509100502.1358298-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:+yn7JakXO0rBclaG1PF6VCE33ABQQlymOK9SwkJBygqL54FX4/o 1Uha7XNAz/bcUptbOQUXb5q3iB+frPKYApZqEd5v+5DNTPnaQNi6uj/tFAA9JS5fcpmpTM4 WWmM3GxT94UJ+Dpcn6ueuq+XEcSq38WlH6Kaet+Uev6TfUM5TQ22anCZWxCgQAyIDs6Iw3Y u5ADLxSDnsMhnSlTj4HMg== X-UI-Out-Filterresults: notjunk:1; V01:K0:dgAMEzCr0pI=:GGSJrXxvhrz2OF6MHgW3uz ENtKvCqM1EEqIOyhgQkkALcCzaf5t7WK8KwYGzqD7cIXDrF7SAXH7CfRER4Rs+NKBBHqd5wke vJHaJnN7HBUHzyD+OmIiF964FU2SaWvkK9B0ZaHHq3KUIY4cCimYX/E5W67VLOlaAnw+l412k 5/ZMSCbe15Z5sWZ5I35uVfwXfAjw8DcetPlOOyqWR5MoRwDVtxoanJsDBz+l5Ah2X5uxYrES9 +UQNqsttAYVsso6DNLbxsiz9dZuabyfxGLYCmcxoRJT88y8J3s6JCAli24Tpd6I0+k7wEEcli oBFD5RL+ytP9iGTLiq/Dh2ocT7jUmHhwjEyoa9W45ypijXe0CrvnOMe01L8PaJlgFzIMBT0z2 5c7CFSSKKxKv9rs1IDUbBHRQ/LIBGvNjxXPpPk7uj+V1Wr9+TkQ2NvkCVXpVXzX7hmksjNAMs BKn04F3DECaSHxaau4Yn78SreLL9NRLNeW8QE7Yc0/mrrKqoBP7E5CXfL3TfZdP4QCMna0sol zjhlNZ8pdZ1+El2tYjS+5CgkLA2XXstIA0m19ueeiKAtFiSQsK8llIeMIa3HJ6Z6LiJODSPwW XPfe9Q78fKaqwX0XX2UCIa8rd8BdNIVZmfDnYRiqmBL5qqi+PomUaz9c+T8c8qzHS8mczQQFP XuwqXCnZC8jFYl6d5KmmdVcD18DNVfINWls+0ew33oexCfMG9NSCvT9Smj+Q6BvjPNDI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Similar to commit c64ebe32d3fc90c52277257d6c9fa7d589877cc2 upstream, this fixes one more 3.16 build failure in kernelci.org that results from a gcc bug: drivers/scsi/mpt2sas/mpt2sas_base.c:3550:1: error: insn does not satisfy its constraints: drivers/scsi/mpt2sas/mpt2sas_base.c:3550:1: internal compiler error: in extract_constrain_insn, at recog.c:2190 This is apparently broken in gcc-6 but fixed in gcc-7, and I cannot reproduce the problem here. However, it is clear that ip27_defconfig does not actually need this driver as the platform has only PCI-X but not PCIe, and the qlge adapter in turn is PCIe-only. The driver was originally enabled in 2010 along with lots of other drivers. Fixes: 59d302b342e5 ("MIPS: IP27: Make defconfig useful again.") Signed-off-by: Arnd Bergmann --- arch/mips/configs/ip27_defconfig | 1 - 1 file changed, 1 deletion(-) -- 2.9.0 diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 7446284dd7b3..cb56ff8d0cdd 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -129,7 +129,6 @@ CONFIG_SCSI_AIC94XX=m CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_MPT2SAS=m CONFIG_LIBFC=m CONFIG_SCSI_QLOGIC_1280=y CONFIG_SCSI_PMCRAID=m From patchwork Tue May 9 10:04:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98902 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739842qge; Tue, 9 May 2017 03:06:21 -0700 (PDT) X-Received: by 10.84.214.144 with SMTP id j16mr8658446pli.133.1494324381045; Tue, 09 May 2017 03:06:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324381; cv=none; d=google.com; s=arc-20160816; b=RMN46t44Pq5185P17rGhmN3b9Ix0pWF+s2kXv5jaVBzccmV8Oo14oNutfdNFISAdh2 c2sTq9c506BPELbvg+gOCyfdxftv0l68w0DamXRGUuZdPycaFnN0X5psvw7FnRqrqpKc i+NQWUU3vzwZPrPxemlwbyTfWpWHrnTWi8nLwRl7tIgjzGEAntFSTAkmnC2hfGWQvo/3 0kEru/TRBOoeoO9R8c1SCcme2bIWKbGPtNzAXVQVeDDfWss6lSqeq25nhotZKBRYQTES HXlZ8eoJUz+xWy8vPWCxzwRxHZpmRX7oWBJLLKyt7Z9SKE/C/MQq8Qq+sGe8fT6YffIH 3YDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=h/nMIgWwVSYKzV9t7a4j4bD5tvQLFVJ+dLGTzn6iBF4=; b=o1tXrJwhmzImas4kKos5KQ8TABlVW7u8onr/vlYzjTraEvfFDmgt6P8XNrzNykCc7b pokjq0gD3iTnLlR3ebXhkFmw4CeWpFkWGUQrmHJ8AEvB07yZ5ewI6UmFchZHyD/n88W4 D1fRvZ+KVMNmrhro11spPFKaloEoeHdsloTgXbrRT1hJj3PsThPVOnQbl7RKlKPG86na 8SvXLr1vT5/pUAL7zMJPg8wC5kyJ3ZnFFXuoRjcHnj6HtQimoCHZdPsRN3mTDMWBmDl8 NK75ZYr/FpVEMPLlk0EbFRsOVfrkhlwnXC6CPvqNT5iEDUxWfNTjisF/8oKTSHoAg5Y4 UcpA== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.06.20; Tue, 09 May 2017 03:06:21 -0700 (PDT) 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; 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 S1752376AbdEIKGU (ORCPT + 6 others); Tue, 9 May 2017 06:06:20 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:52510 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbdEIKGT (ORCPT ); Tue, 9 May 2017 06:06:19 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MJ09d-1d9xxJ3Um9-002au9; Tue, 09 May 2017 12:05:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, "Peter Zijlstra (Intel)" , Arnaldo Carvalho de Melo , Javi Merino , Linus Torvalds , Mathieu Desnoyers , Oleg Nesterov , Paul Mackerras , Petr Mladek , Steven Rostedt , Tom Zanussi , Vaibhav Nagarnaik , Ingo Molnar , Arnd Bergmann Subject: [PATCH 3.16-stable 05/14] perf: Avoid horrible stack usage Date: Tue, 9 May 2017 12:04:53 +0200 Message-Id: <20170509100502.1358298-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:B31etINwNAYD3nFNGThgalqonvfNl6S9zR2vAxEnUAcPSHx1c7/ h2cx4n9xInWvtToN5OaQcuVfVPjqqKv5Hm/n20XG+TC75cTpQDxKLab5mhqZ+rshqFHdMyb npxigJBP1jVhw4BEZJGXz7R0bgIJErgfpyzp0R2gYoAJw3FDpYcxM4rSN87WL6AAohblchG oyAviCSl5Wi86gBPWGpjw== X-UI-Out-Filterresults: notjunk:1; V01:K0:bAvKIxkZ8VU=:EoK8X0yGBUu0LhXB0ZHNv7 5wlqs0PCoxohwPH+aAW5NPHBdRQlTeeXchWrajibn9UmYYnzxKEiYXoE4OJXVmFTQlyBtgloa Y7j35clw+odMr9fgGYYUTd0lyZcA1OTG5JGq8ucIhBX7e62FDLYXNIub0aHFCPmJiAZvWVGCQ Ii1vkx7xTFKtsny6JvbdVg5Djuzb0JBsReoBnVLThJJAmNKjmoFFIKFhE/hNCV0nPhmfBdM+f VIWhtIpamGNT1JqfhAsoQuGrtz0EySoKt+5D5bvVIaxVDDbkEHfT0ncx2TP4JqMbCrwK3TWec NYq1cURKfvqSI9fqsuAHLsCMvXN7AGlMhaqwWMWWEgVRAFbgglKecifs3NtBVDLW7QROb3Kdx YmJ63kEkjmuJoRDhLg4lQc8B9ikGPbIDOwiHP1dM/uiXB7qTmZFPBWSbyLIti4g0f02XYCJRs QIGYM1y5v7F9j3zOxNA5HqrIthvxzlE0RgDInj//dm2VWWB2L52j664iP+r07A0sl5v1fOeoe +4Nd4X2FR8weOfdjs2JfCRFL1u9LXm/Ghoms5w4KnJwhv/Pw1z8eyLmcJxvCtOr90u6X4NrUD nG4KXjGi1AESnwbBUzCxsA4n2LdDCPTz4t1JVdQyKBvJPZFKlIQf3b/70pdqffuTAQSffn2b+ /v7T431pXQuxOb37LLl/uySLm6kspOhCIIBO7m3UlGip9DoV/gcX3GRjgFyylGYU6DmU= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "Peter Zijlstra (Intel)" commit 86038c5ea81b519a8a1fcfcd5e4599aab0cdd119 upstream. Both Linus (most recent) and Steve (a while ago) reported that perf related callbacks have massive stack bloat. The problem is that software events need a pt_regs in order to properly report the event location and unwind stack. And because we could not assume one was present we allocated one on stack and filled it with minimal bits required for operation. Now, pt_regs is quite large, so this is undesirable. Furthermore it turns out that most sites actually have a pt_regs pointer available, making this even more onerous, as the stack space is pointless waste. This patch addresses the problem by observing that software events have well defined nesting semantics, therefore we can use static per-cpu storage instead of on-stack. Linus made the further observation that all but the scheduler callers of perf_sw_event() have a pt_regs available, so we change the regular perf_sw_event() to require a valid pt_regs (where it used to be optional) and add perf_sw_event_sched() for the scheduler. We have a scheduler specific call instead of a more generic _noregs() like construct because we can assume non-recursion from the scheduler and thereby simplify the code further (_noregs would have to put the recursion context call inline in order to assertain which __perf_regs element to use). One last note on the implementation of perf_trace_buf_prepare(); we allow .regs = NULL for those cases where we already have a pt_regs pointer available and do not need another. Reported-by: Linus Torvalds Reported-by: Steven Rostedt Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Javi Merino Cc: Linus Torvalds Cc: Mathieu Desnoyers Cc: Oleg Nesterov Cc: Paul Mackerras Cc: Petr Mladek Cc: Steven Rostedt Cc: Tom Zanussi Cc: Vaibhav Nagarnaik Link: http://lkml.kernel.org/r/20141216115041.GW3337@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar Signed-off-by: Arnd Bergmann --- include/linux/ftrace_event.h | 2 +- include/linux/perf_event.h | 28 +++++++++++++++++++++------- include/trace/ftrace.h | 7 ++++--- kernel/events/core.c | 23 +++++++++++++++++------ kernel/sched/core.c | 2 +- kernel/trace/trace_event_perf.c | 4 +++- kernel/trace/trace_kprobe.c | 4 ++-- kernel/trace/trace_syscalls.c | 4 ++-- kernel/trace/trace_uprobe.c | 2 +- 9 files changed, 52 insertions(+), 24 deletions(-) -- 2.9.0 diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index cff3106ffe2c..c817d7938b4b 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -621,7 +621,7 @@ extern int ftrace_profile_set_filter(struct perf_event *event, int event_id, char *filter_str); extern void ftrace_profile_free_filter(struct perf_event *event); extern void *perf_trace_buf_prepare(int size, unsigned short type, - struct pt_regs *regs, int *rctxp); + struct pt_regs **regs, int *rctxp); static inline void perf_trace_buf_submit(void *raw_data, int size, int rctx, u64 addr, diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 7e8445e9dcbf..d86153fef0e0 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -642,6 +642,7 @@ static inline int is_software_event(struct perf_event *event) extern struct static_key perf_swevent_enabled[PERF_COUNT_SW_MAX]; +extern void ___perf_sw_event(u32, u64, struct pt_regs *, u64); extern void __perf_sw_event(u32, u64, struct pt_regs *, u64); #ifndef perf_arch_fetch_caller_regs @@ -666,14 +667,25 @@ static inline void perf_fetch_caller_regs(struct pt_regs *regs) static __always_inline void perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) { - struct pt_regs hot_regs; + if (static_key_false(&perf_swevent_enabled[event_id])) + __perf_sw_event(event_id, nr, regs, addr); +} + +DECLARE_PER_CPU(struct pt_regs, __perf_regs[4]); +/* + * 'Special' version for the scheduler, it hard assumes no recursion, + * which is guaranteed by us not actually scheduling inside other swevents + * because those disable preemption. + */ +static __always_inline void +perf_sw_event_sched(u32 event_id, u64 nr, u64 addr) +{ if (static_key_false(&perf_swevent_enabled[event_id])) { - if (!regs) { - perf_fetch_caller_regs(&hot_regs); - regs = &hot_regs; - } - __perf_sw_event(event_id, nr, regs, addr); + struct pt_regs *regs = this_cpu_ptr(&__perf_regs[0]); + + perf_fetch_caller_regs(regs); + ___perf_sw_event(event_id, nr, regs, addr); } } @@ -689,7 +701,7 @@ static inline void perf_event_task_sched_in(struct task_struct *prev, static inline void perf_event_task_sched_out(struct task_struct *prev, struct task_struct *next) { - perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, NULL, 0); + perf_sw_event_sched(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 0); if (static_key_false(&perf_sched_events.key)) __perf_event_task_sched_out(prev, next); @@ -800,6 +812,8 @@ static inline int perf_event_refresh(struct perf_event *event, int refresh) static inline void perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) { } static inline void +perf_sw_event_sched(u32 event_id, u64 nr, u64 addr) { } +static inline void perf_bp_event(struct perf_event *event, void *data) { } static inline int perf_register_guest_info_callbacks diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 26b4f2e13275..bb1f5d82ad49 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -765,7 +765,7 @@ perf_trace_##call(void *__data, proto) \ struct ftrace_event_call *event_call = __data; \ struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\ struct ftrace_raw_##call *entry; \ - struct pt_regs __regs; \ + struct pt_regs *__regs; \ u64 __addr = 0, __count = 1; \ struct task_struct *__task = NULL; \ struct hlist_head *head; \ @@ -784,18 +784,19 @@ perf_trace_##call(void *__data, proto) \ sizeof(u64)); \ __entry_size -= sizeof(u32); \ \ - perf_fetch_caller_regs(&__regs); \ entry = perf_trace_buf_prepare(__entry_size, \ event_call->event.type, &__regs, &rctx); \ if (!entry) \ return; \ \ + perf_fetch_caller_regs(__regs); \ + \ tstruct \ \ { assign; } \ \ perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \ - __count, &__regs, head, __task); \ + __count, __regs, head, __task); \ } /* diff --git a/kernel/events/core.c b/kernel/events/core.c index 2faaed3ba61b..48988c7ac954 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5934,6 +5934,8 @@ end: rcu_read_unlock(); } +DEFINE_PER_CPU(struct pt_regs, __perf_regs[4]); + int perf_swevent_get_recursion_context(void) { struct swevent_htable *swhash = &__get_cpu_var(swevent_htable); @@ -5949,21 +5951,30 @@ inline void perf_swevent_put_recursion_context(int rctx) put_recursion_context(swhash->recursion, rctx); } -void __perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) +void ___perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) { struct perf_sample_data data; - int rctx; - preempt_disable_notrace(); - rctx = perf_swevent_get_recursion_context(); - if (rctx < 0) + if (WARN_ON_ONCE(!regs)) return; perf_sample_data_init(&data, addr, 0); - do_perf_sw_event(PERF_TYPE_SOFTWARE, event_id, nr, &data, regs); +} + +void __perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) +{ + int rctx; + + preempt_disable_notrace(); + rctx = perf_swevent_get_recursion_context(); + if (unlikely(rctx < 0)) + goto fail; + + ___perf_sw_event(event_id, nr, regs, addr); perf_swevent_put_recursion_context(rctx); +fail: preempt_enable_notrace(); } diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f2c0bcc4ba6c..e5cd1088c1dc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1085,7 +1085,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) if (p->sched_class->migrate_task_rq) p->sched_class->migrate_task_rq(p, new_cpu); p->se.nr_migrations++; - perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, NULL, 0); + perf_sw_event_sched(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 0); tmn.task = p; tmn.from_cpu = task_cpu(p); diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 5d12bb407b44..a818e5601f89 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -249,7 +249,7 @@ void perf_trace_del(struct perf_event *p_event, int flags) } void *perf_trace_buf_prepare(int size, unsigned short type, - struct pt_regs *regs, int *rctxp) + struct pt_regs **regs, int *rctxp) { struct trace_entry *entry; unsigned long flags; @@ -268,6 +268,8 @@ void *perf_trace_buf_prepare(int size, unsigned short type, if (*rctxp < 0) return NULL; + if (regs) + *regs = this_cpu_ptr(&__perf_regs[*rctxp]); raw_data = this_cpu_ptr(perf_trace_buf[*rctxp]); /* zero the dead bytes from align to not leak stack to user */ diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 282f6e4e5539..22328503aa3e 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1158,7 +1158,7 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs) size = ALIGN(__size + sizeof(u32), sizeof(u64)); size -= sizeof(u32); - entry = perf_trace_buf_prepare(size, call->event.type, regs, &rctx); + entry = perf_trace_buf_prepare(size, call->event.type, NULL, &rctx); if (!entry) return; @@ -1189,7 +1189,7 @@ kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, size = ALIGN(__size + sizeof(u32), sizeof(u64)); size -= sizeof(u32); - entry = perf_trace_buf_prepare(size, call->event.type, regs, &rctx); + entry = perf_trace_buf_prepare(size, call->event.type, NULL, &rctx); if (!entry) return; diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 7e3cd7aaec83..ba78f0e3477d 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -586,7 +586,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id) size -= sizeof(u32); rec = (struct syscall_trace_enter *)perf_trace_buf_prepare(size, - sys_data->enter_event->event.type, regs, &rctx); + sys_data->enter_event->event.type, NULL, &rctx); if (!rec) return; @@ -659,7 +659,7 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret) size -= sizeof(u32); rec = (struct syscall_trace_exit *)perf_trace_buf_prepare(size, - sys_data->exit_event->event.type, regs, &rctx); + sys_data->exit_event->event.type, NULL, &rctx); if (!rec) return; diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 3c9b97e6b1f4..5224e836acde 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -1116,7 +1116,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, if (hlist_empty(head)) goto out; - entry = perf_trace_buf_prepare(size, call->event.type, regs, &rctx); + entry = perf_trace_buf_prepare(size, call->event.type, NULL, &rctx); if (!entry) goto out; From patchwork Tue May 9 10:04:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98899 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739469qge; Tue, 9 May 2017 03:05:26 -0700 (PDT) X-Received: by 10.98.194.69 with SMTP id l66mr37182941pfg.55.1494324326448; Tue, 09 May 2017 03:05:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324326; cv=none; d=google.com; s=arc-20160816; b=OQE9XuAW7l9emxkn/AjNzrkUnUrK3EV8OcLEqkQyAviKbp1kduIX78g6Y8j6Ao8bLF 2Axv5QGYEYjePT9hYjeR/XffcK6VgiVE6iMJYsbWsWuCWoz1n5E3leCWE0uYz/e/qKm0 08lGsOPb+QygQMd0JhxG4lWeOtudjgfP+kmJNJLAOg4X2CSAOOaO2F5H5f/xuVNDbApi 7asO20lkxJ7M+YpwtG/m5yD1v2MbIQp6tRLyswyRUP9uH3D1NFdNoinATtXbVWfWK59d BHhT507BHTCfU9tAbrz6wASekkK96m0EitjfkkUToT82EIL/+nmO34OG6B4Usy7l0cYg L1Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=xhLCAPeg2AGAO5SaayC2wP4EmLq6PB9iFPhpl9BZVd0=; b=sCY6Ul4kAMnWEiXkbZHTj4/vY5ZruRMdu3GKo0438UWU+0nG3b/HYdmnRiUvjRUuXU 153BOKC+ZXwrI4GuLPvBiIt1gy6x5aZJRSuVDfJUU4KYfRn2zFG+RTXmNjPDJzJ39mnD Aj0wNPzPJwYo8IXSfFVn/HCVmSMmhOu6xd9RbmclFFCKCNvLYXS93layIDK0LmIFMNcN wwy4c+raWotN7qKwIFlp7Pf65w+CqpW2FdFrl+z7kVKQ3PP/AEtXjd0Gi+j27D/O1XEQ YEPjCc2NbwSnaLG1c6Lx7sbQk2Lk7RhCZ2uefu16JCpuX3pIYVnBtN/NB8cZTShOoKE2 M1Eg== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.26; Tue, 09 May 2017 03:05:26 -0700 (PDT) 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; 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 S1752183AbdEIKFZ (ORCPT + 6 others); Tue, 9 May 2017 06:05:25 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56368 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752140AbdEIKFY (ORCPT ); Tue, 9 May 2017 06:05:24 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0M2HkO-1dzr5h0rau-00s6E8; Tue, 09 May 2017 12:05:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Lars-Peter Clausen Subject: [PATCH 3.16-stable 06/14] MIPS: jz4740: fix build error in irq.h Date: Tue, 9 May 2017 12:04:54 +0200 Message-Id: <20170509100502.1358298-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:7AJo1gii9CgJti19mX2yRovk6+QVYqlLxbrZDXdp5/WCEMlJTjO EYyOkMidELZQJUFgJJGFgMtOcNcvm+Es0KK5WOVNl9wVehhDVemxI61EzjAf/QWQl+3X6OO IYsA1Ywj+Xp+it8NI/nYZUmjcDEWhmodH/mJe0+xfoOxiNWmRFiidszR8r5a71OF+yHqSX4 Mxg0ycjd2n3D4a6RvGpKA== X-UI-Out-Filterresults: notjunk:1; V01:K0:vVLUEAQaB2w=:903FJ1xzlSaTGr9dKI+OTV OeXgOsuoIRpSMnqfJYNjWmmBiabKHE5ZkFpyTuHVSRYbdBr0y189vV16EzaAuilkvVhMTC+VL /7Bo6HqOrgZ2G+R69xHHw7Vf6bo4nqLr5J7tbrdHiSZ4UAYCl15hfG/oukcNGjHKLhXMF5FJA 2uim/pBcSOkFbjiP97+qoBOu/nP49xaJ7AYgTK/wiSGsb8JNUegbiIQR8g67ZMJYsb854m+lD QZPW7i/z38KDX5L0HjYHjdn+aJLxPTO+GKglVXKoIg4AkuZZxhIkmVpselR9zWdsu9FmKzRd1 dZONEcfduy3FSxyGJOhdamyASBDQlHHLtCpLw1RPIJhB2FZc4mw6O1RWJ6+5ywsfl9vgB8ObQ JkwV/R1LjRF+kxfb5l8hSubGtosB0ojHUVJDdy9jfknAzSTydSDiAJBpxPqsYoU5YJxq+i6Ry TlMpjMS3OFNoKA1DzD7L270SM3TpAZjjo9zJmXUTRJuVfMn+/HRcOnyQPS/0Nb905Cu87XVZT 8lgWKjxZ+dcD5hcKHu/Cdr1Klb6pA1uteoszjuDW83G5KJVb+hfIBH7nXkHxzlBYlijTz12yo PagKTD5x/daJbMNrYSl2Mv3qUIPIXmpJTtj55sl7voMQ5jLIKFq7esrBM/Lbknq7X35nLbpnB BB0tSHa4b4pmCWSSHTSuoDEJsYk7yDHBGIDRZt906UMnYdE12LGUR1LiSGmKJH5A4nFU= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org kernelci found build error on the 3.16 and 3.18 stable trees that don't show up in later versions: arch/mips/jz4740/irq.h:21:38: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror] arch/mips/jz4740/irq.h:20:39: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror] include/linux/irqdesc.h:92:33: error: 'NR_IRQS' undeclared here (not in a function) arch/mips/jz4740/irq.c:91:41: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function) arch/mips/jz4740/irq.c:68:6: error: conflicting types for 'jz4740_irq_resume' arch/mips/jz4740/irq.c:62:6: error: conflicting types for 'jz4740_irq_suspend' arch/mips/jz4740/irq.c:49:39: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function) arch/mips/jz4740/gpio.c:47:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:46:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:45:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:44:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:447:22: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] arch/mips/jz4740/gpio.c:446:23: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] arch/mips/jz4740/gpio.c:427:14: error: implicit declaration of function 'JZ4740_IRQ_INTC_GPIO' [-Werror=implicit-function-declaration] arch/mips/jz4740/gpio.c:269:9: error: implicit declaration of function 'JZ4740_IRQ_GPIO' [-Werror=implicit-function-declaration] The problem seems to be caused by commit 83bc76920080 ("MIPS: JZ4740: Use generic irq chip") from linux-3.2, but only showed up in a defconfig build when qi_lb60_defconfig was added in linux-3.13 and that configuration never successfully built. The code has changed in a number of ways before 4.4, which builds fine. While I did not bisect the problem to a specific change, I found a simple fix by including the obviously missing header. Cc: Lars-Peter Clausen Signed-off-by: Arnd Bergmann --- arch/mips/jz4740/irq.h | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/arch/mips/jz4740/irq.h b/arch/mips/jz4740/irq.h index 0f48720b5b63..486db78808cc 100644 --- a/arch/mips/jz4740/irq.h +++ b/arch/mips/jz4740/irq.h @@ -16,7 +16,9 @@ #define __MIPS_JZ4740_IRQ_H__ #include +#include +struct irq_data; extern void jz4740_irq_suspend(struct irq_data *data); extern void jz4740_irq_resume(struct irq_data *data); From patchwork Tue May 9 10:04:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98892 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739413qge; Tue, 9 May 2017 03:05:18 -0700 (PDT) X-Received: by 10.99.137.194 with SMTP id v185mr23341504pgd.206.1494324318120; Tue, 09 May 2017 03:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324318; cv=none; d=google.com; s=arc-20160816; b=jiIJshn7dRfgLSEO+ItFFRnzVybjjUz+suvCwMLQcMJIsbiDRkc/Z98VzIiwIScIM8 KBSN3qBLwDd5sJso582IHRW/Ikz/bpxM+DyPEI6VYNV8d4emx1VVW4I8xrcMMJp4LcVB DbVqrlVxZjixe6FTgShQ1gJbGereDueV/vVm6NZA5XHpAktfqZ19CvtTWO+occX8Odhd dhcb5RCayKilwJiYECmYsd4JQXSxgCYc1Lfd7Babx98QINNgRJONSl5P4SVVbf/Ugb1t g3P8iAn3ZdOGf9q53wXFjUyxFFjENwsTGHtMZDZaQiwhDHY6QBbJztPW+dk2lQFPVQ3j g5vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=ha6SU9qcxNVswNiOuGgSehEkGPmE+o7BeP0GNyuda/s=; b=RCa4ngGBoZSwvk/hly847LbKocpP1DnlwaYVOHeEwW3kDWweMCWfVOstzzlX9N0JMN G7m2w+0Tt3WNaBjOLe9q2cVy55jjIxtWzkWnOXpgCCoRD8lkTzc3TY9A8tBn0ZAxDKf9 m7rpOda7fuYJMaMclVxta5qkTbG1l53CvK+A+8yzZBQoRYZPadqcXnR3BSJUJ0+m8tEf /MnURs+jne9cOK3e/F21VFvPjFLStiW6EKwlkW8mRNWBTxM6Frg7z1bv0hAn1ap8mPm6 iLhifJgKpxiFP77UX3Q8iL+g1PqXxyLDs1eYqVCTcNRpjsDxk7pE5tE8osGfdY+Q0Rz3 VAYw== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.17; Tue, 09 May 2017 03:05:18 -0700 (PDT) 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; 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 S1751653AbdEIKFQ (ORCPT + 6 others); Tue, 9 May 2017 06:05:16 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:51559 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751203AbdEIKFQ (ORCPT ); Tue, 9 May 2017 06:05:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LfFcq-1dniYj22iO-00ontY; Tue, 09 May 2017 12:05:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 07/14] MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers. Date: Tue, 9 May 2017 12:04:55 +0200 Message-Id: <20170509100502.1358298-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:COA+swoYOFTTD4an3BXY3Ac3fTKt59W4OLG/JSQtsfv6BMhQaOe N0r8zltPsjfa8Ef7uB3kZx/4gSvB+7uVSbr+odVIbTrw1ZB1P5XsxniJlAtHf8KtAyvVQd8 Oc8j6zPBlQUTXiwZQ361IdB8+5sUqYJf/W5TtEwIWFf06j/DuAdt63r+Y0GFlsdBhu2fX+c nSdd0tWPBthpWcd8n712g== X-UI-Out-Filterresults: notjunk:1; V01:K0:wpBjxTeuBtQ=:PhjAGa8MLZ5h/RMCEt+yjS nKEq20CGmAIdpZFOY/R/CsTLtiaoJUHYQD3b5Gol8YOl3s20qPNaVtsOg/wKwa/o5uWe1IRff yCuFHAzoSrTv6rdeDqt8Mz/qlOcgLHIXpR9p3lOTugQoQ7ectRb5ggURJ5PN5LBP4YlIE0Jnr G+dXkuXsvzaDsf95uLC0bw7WccjMDRtdmIhhMO1NcklTiGDKDZTLqFSGDcJdNss67DGjMDNSm fGDuufr4/9rtdKmvPrTvcRT5PM+ui3uEyCmI+ouYHcpSLRCRyYxom1qyEWvr4irH9uj+KHN9N Tw3cGiUbHlwbb+q3RQAxxlDQCG7Z7wxgQ+fSjJ6H9q7BZ6JNe/6+hqtDv7h0EBE708++RTiP9 jg/bxlwtpApWFI/v+KHbjAcTZu4Pq5xLp8StjW+d5HdUacQsD2x/XqcW7GIksazbVu6RUZbQ7 6veLSfh+t/J0oc4U6A+Y7sgIglBuCwFxBQjSgEf/C8LM0MW3L6LexLrSxvP3kJigYa4njp249 AKxeLa7Ve8oP+jc4x5A2gKDQOM7fE6wzLXu6X0d128r3m5+MnJFiouzG1DVotrXtxv3F2ltnw b6N/dSvPAbkxqcI1ydaNJI605cPt0mJ5M6BVxHGlmCYJ0TOfyKMd7zn+gfgT5YxZABGhc7Jcf e4jaCc9jg/dOQ4ZB/hSuSLaKatibACPGTFC/i9thw8QSE2WQfUJWq0DnN3JbUJKaBP+I= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ralf Baechle Commit 26f7c4bd05cf34e63a4a794150ab66a40a5a84a9 upstream. These are generated by very recent toolchains and result in an error message when attenpting to convert a kernel from ELF to ECOFF. Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/boot/elf2ecoff.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/mips/boot/elf2ecoff.c b/arch/mips/boot/elf2ecoff.c index bef06453edc0..6950fee4576c 100644 --- a/arch/mips/boot/elf2ecoff.c +++ b/arch/mips/boot/elf2ecoff.c @@ -49,7 +49,8 @@ /* * Some extra ELF definitions */ -#define PT_MIPS_REGINFO 0x70000000 /* Register usage information */ +#define PT_MIPS_REGINFO 0x70000000 /* Register usage information */ +#define PT_MIPS_ABIFLAGS 0x70000003 /* Records ABI related flags */ /* -------------------------------------------------------------------- */ @@ -347,7 +348,8 @@ int main(int argc, char *argv[]) /* Section types we can ignore... */ if (ph[i].p_type == PT_NULL || ph[i].p_type == PT_NOTE || ph[i].p_type == PT_PHDR - || ph[i].p_type == PT_MIPS_REGINFO) + || ph[i].p_type == PT_MIPS_REGINFO + || ph[i].p_type == PT_MIPS_ABIFLAGS) continue; /* Section types we can't handle... */ else if (ph[i].p_type != PT_LOAD) { From patchwork Tue May 9 10:04:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98894 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739417qge; Tue, 9 May 2017 03:05:18 -0700 (PDT) X-Received: by 10.84.238.199 with SMTP id l7mr62331487pln.153.1494324318739; Tue, 09 May 2017 03:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324318; cv=none; d=google.com; s=arc-20160816; b=0Y54Dlx+8mgA1CX0pWIFzgIaXaQXa1X/CoQQzsyr16w6Tv1X8cdhptRdeOVsEolP/p ZUTBdj055/OHE90RN6Z1Fj7wmo48DBXKniH35cICMQsIwT/YQlkLwdywW29st4zf4V+K zWtya3akw/Q7a07WJDfU5I7Xh9WaqDWO75ERxk5lj1nGBis3DvslFBk8mAQZFSeMTcaV op9CQ3l6gGMAo2dYeqbweZ19YANRDE3IMR527ECYd3AKyjZpQYIlixdJH8+wiMwfW2CE FItp3kmK6KU+VxMYdc0sZ9DFf/W8kzeH0FdjSrLKT17LKkzREe4yyKgNqw289tri0Jva 2qcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=uX4nhASCdDFUd54Jt78z/Q72fGUoMhaxGSYoCFXDQGs=; b=AUr1hFUcHRCR5FARJ0FRFOgdfLoF6OJyhPTpMMD/lqgQg/HLGh0rViCQ7LjT9VealE YTXwPOzrY+TPYkO+1Cz2/gkXFJ4Cr0qKtcxy6cV16IKNBK1/aUso6NnL70hcTtc3dwR2 vGPH/WE4/MPIekhju5Gc/Vtdu0OuXaKEyufQxuxqB+S817paXnFCD5SY9tPfetPDgrKL xRBUOWpxSoqTVUuqsExo+yRd3szRuv/0Qmm7rhXZUAJB8Q6Yi4BcN6fC13wRSGsWMDEt CV+NXTET0PDDTtEHL/+rLuZyT9Uthire0yN6oirBkvxw1dW+wChpszzmQ7Jvpet3ttzs Yr0g== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.18; Tue, 09 May 2017 03:05:18 -0700 (PDT) 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; 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 S1751295AbdEIKFR (ORCPT + 6 others); Tue, 9 May 2017 06:05:17 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:52733 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbdEIKFQ (ORCPT ); Tue, 9 May 2017 06:05:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LbvAu-1dr1Q53Mgu-00jKmi; Tue, 09 May 2017 12:05:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 08/14] gfs2: remove IS_ERR_VALUE abuse Date: Tue, 9 May 2017 12:04:56 +0200 Message-Id: <20170509100502.1358298-9-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:rMUAcIteSu+Pn8s/jMy++A0uIaMBnzRNPow1NXxbti2gG8TnxCS YOoaB2BQGRr6FqgSMju2NvtactvGMPwTfT01il/DXL0V3I7ANLK8BfdrkC/27M863W+9jDN ZtOme+f8zqkWVKDusDce62TE0uE7rok5Rc91i0a6U+D64wJgMuJ9U3vi4BwZZoyuqOYCH5x q9syIK/VU4/BJDl2dXWcA== X-UI-Out-Filterresults: notjunk:1; V01:K0:q0dSqlm00G0=:bm3fr7iuVxhrluhaRubTKh lOmw6SXethq1mgf96+i9gO77FjH8LBxAPOlCxg7mXlAOnY/0nlhHpCBwi0Px6xkN/iBFA+v/B DDssrvYs5WOZgH+e9i5/zYfwL4b9ClRchNRXFtzZquRusx4/53OiUdskbRszI0CgQSm8k5avN z/lAsCQZ+cnbKEWOxRnNnc8tiHJVo5p2Dlx/IFDV7ZK7Q2Kjvk2f30TNPmZrsIUj46Yj9oH0t dEfphs6dI5i+Q6zgaGdbve1EClwSSPHvo9k+EiBQb6QFsECThSKRApGJWk86AYQkFFT6c03jH FmbY6yzEhCdUkpsD/4U/4kzer6HaCFkQpDLkWvz7jQiCur+uZqzPXZlZrep+iTdwDM8bIQBY6 8xm6KTES2Xr5aKNqu6gGQ2bIAC809UcaXQDhY5dZl2QLbf9G2WWcWDzVwmV4f7xnAsM5z8B93 p+OuEnbJ6OswWcS6soeclSww706a4xkzPeHb3UnTTAo9IXjXCnzWWtqDRFbVd5KiL4L94bRut 9B2NOIcZsBMdc4RxK3dmnManWPLXEmrX0Hm9tZIGB/RWLHX+VtTYIbhbWIkdq28KigT3JvubY 8Ar1DamSLbNE8DPgk29VBGg6WxZcFcsVnmOFCgbmeCLkmUZblLBRrJBb5qaPxDdvhqcKgK8LT BJModsXR2kyjz2Vo8cv+iW/SE9Qmf3V2XYXLpq+GMTG4tznmPAc5i31z+BiZCBhSr3/U= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Picked from commit 287980e49ffc0f6d911601e7e352a812ed27768e ("remove lots of IS_ERR_VALUE abuses") upstream. The original fix that was backported to 3.18 already addressed the warning in some configurations, but not in others, leaving us with the same output: ../fs/gfs2/dir.c: In function 'get_first_leaf': ../fs/gfs2/dir.c:768:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] error = get_leaf(dip, leaf_no, bh_out); ^ ../fs/gfs2/dir.c: In function 'dir_split_leaf.isra.20': ../fs/gfs2/dir.c:987:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] This takes the approach that we took in later versions in mainline, but does not backport the entire patch, as that would be too large for stable and IIRC caused regressions in other drivers. Fixes: 9d46d31e9aea ("gfs2: avoid uninitialized variable warning") Signed-off-by: Arnd Bergmann --- fs/gfs2/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 6810c8772eb1..f3508f4583d5 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -767,7 +767,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index, int error; error = get_leaf_nr(dip, index, &leaf_no); - if (!IS_ERR_VALUE(error)) + if (!error) error = get_leaf(dip, leaf_no, bh_out); return error; @@ -983,7 +983,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) index = name->hash >> (32 - dip->i_depth); error = get_leaf_nr(dip, index, &leaf_no); - if (IS_ERR_VALUE(error)) + if (error) return error; /* Get the old leaf block */ From patchwork Tue May 9 10:04:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98900 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739470qge; Tue, 9 May 2017 03:05:26 -0700 (PDT) X-Received: by 10.99.145.195 with SMTP id l186mr23544684pge.123.1494324326803; Tue, 09 May 2017 03:05:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324326; cv=none; d=google.com; s=arc-20160816; b=RE7oTZioP9Iu6od+rF3zAKLAvt88uvyJcgA17Y0C4o36UVSRUT6NvMpLu+6qRy6pPx NmPGJ1fiVjavSV4/khrkAm5zJRK0+gz79cxeJDhfbjCvxgfVL4a/XgOyVrt/jdHL0Djk 7+oKR/vKroywt1MZT8hIs3Knq05nCOfNav/5guScHc4g0NGXYbfRzzVS0FLhOXWg2ZrN bS03TeLj0XRRN3UkrX2Ze4qwlo+yHR8n2R25CAlLxTQZVS8sUzoWBcZMVz97undKubjs m6AZu1XltxNenRGLHLlEBhZIZuW5H93VsrOg2+b9u1HZfRZ8PTNEhyF7gx1izXZQ3a/U 64zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=cDgLU7Cg/M6TJiEpxoHch+3iX0BhystHsj7XhRYN890=; b=tbv0SRiy+bZzVMrRc1KbbuZAe2DJbY9ZFMAnWfoVkIOCYhsxVjisnN9dnQU7jBy2Jc w56zHoYHbr3ZgHMFhZLLW25etxqXcNKeq5Wd/jbckAveUwe4/GXdz3X8qruI7GjYwTJf h8tUsUI039Br51fHSexSOPplx8VJt7pgjdjaDmJ4tHcosIEcOgTr9LQQJxTp8ACrE5Cx ppKwIXPwFXbFQq4h9I6bbK8sPmG4vUmDIrZC57qshTk/iktOx+8SNHIC/1j7AI0HIE3c WZGpLMk0yVlLQjY3EFDF8fubBhQpgHmDH3GZKPjQMrVsk3/GYcN/hIzruWrFq/ZcktK3 V88g== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.26; Tue, 09 May 2017 03:05:26 -0700 (PDT) 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; 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 S1752140AbdEIKFZ (ORCPT + 6 others); Tue, 9 May 2017 06:05:25 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:64748 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbdEIKFZ (ORCPT ); Tue, 9 May 2017 06:05:25 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXCaX-1dUwBt2MLN-00WBXx; Tue, 09 May 2017 12:05:16 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Paul Burton , "David S . Miller" , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 09/14] net: ti: cpmac: Fix compiler warning due to type confusion Date: Tue, 9 May 2017 12:04:57 +0200 Message-Id: <20170509100502.1358298-10-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:CyoXghO2VmLlcH4sBC4eMM3slR8IzF47MbJXmYUD9nkb5ZBaf1i bPuRf/UOnuR58bryMqfBnmGU7SSvu1PZwRX/0DVC+YW0xrU0a2mIl5wuXNGD8LKxy3mgEVu wi6/fC3B6EtSlPDW7pEjb0lkPNuoFZGHNkl08up0IqL5Vu61zCxpv9Cw7pMt/idPL1mDNaR vOvhJjXkGG7rpDbiXmiMQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:3zDecCDqhno=:iSN82U/MSJH7hRN8W0PhiI r5ZsPkq2hfGc5BillJ0IWPmKOArIuqzRxsrufmnkNUf+SLnr3Ws2RzVla9/hVltRjsjzm13k+ rEZWsq8Ow7RwwECJ3nklXd0QiveVVgFc/HVJkrMu7+TvBShVEWXi0FPRt/w+2fIpMbcJyUMtu 1qRkXrTiMYS1D9nO5HEU2HMqNekt0aC430tfu9M+9DSuLDObVxbbPNhHpc2M46wM//Vl/0Pup yUL7wjnz3mD0hz/YcRDVPOO8/MXblN55CalgYFYvFisB2gCAwBP5LhfcPJZRuC2RXagMeROFy igajeCMz3RzNwt7ICtf3oNGOhuohfJ+BGPAovCp8JVttBAzDdjST8UHzKBHpdiTWtFfK9Wfd4 dlUPkkIRD+koBcQ4vlbZ2vzqFLC8Cx/WbeTJbVNr9DvPetgijLxA8lY2Tp1RU23ENnUVV7qll Xt/9lSmuihMB3PsYvKQBVwnC8GLeAYiKrvwJGXDCxclHZeuFcnjbPcgSzlzyTN3uakgWj/nCf wH2ZWVICaXpHjE4rzxbv48Tf4dyXpwIOv0i8QaS/rAW/NRRqk5vxXjVaUeEbnT0H/8QBA6jVW GqJ0GMLMLMpJwdmkd74LUAXQqra2djAOPBjroTYIyJDdtt3F6oY3hD2ZC6//1FENXDSPRDmfd qHrBdjjtb94HWPSniXnC7fb2mIn74sDsCbbtGctUuleb4ZZImYB/aVgg5aT99B/JQmfg= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Burton commit 2f5281ba2a8feaf6f0aee93356f350855bb530fc upstream. cpmac_start_xmit() used the max() macro on skb->len (an unsigned int) and ETH_ZLEN (a signed int literal). This led to the following compiler warning: In file included from include/linux/list.h:8:0, from include/linux/module.h:9, from drivers/net/ethernet/ti/cpmac.c:19: drivers/net/ethernet/ti/cpmac.c: In function 'cpmac_start_xmit': include/linux/kernel.h:748:17: warning: comparison of distinct pointer types lacks a cast (void) (&_max1 == &_max2); \ ^ drivers/net/ethernet/ti/cpmac.c:560:8: note: in expansion of macro 'max' len = max(skb->len, ETH_ZLEN); ^ On top of this, it assigned the result of the max() macro to a signed integer whilst all further uses of it result in it being cast to varying widths of unsigned integer. Fix this up by using max_t to ensure the comparison is performed as unsigned integers, and for consistency change the type of the len variable to unsigned int. Signed-off-by: Paul Burton Signed-off-by: David S. Miller Cc: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ti/cpmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c index 44d5a7bee0d7..755ddd586189 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c @@ -543,7 +543,8 @@ fatal_error: static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) { - int queue, len; + int queue; + unsigned int len; struct cpmac_desc *desc; struct cpmac_priv *priv = netdev_priv(dev); @@ -553,7 +554,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(skb_padto(skb, ETH_ZLEN))) return NETDEV_TX_OK; - len = max(skb->len, ETH_ZLEN); + len = max_t(unsigned int, skb->len, ETH_ZLEN); queue = skb_get_queue_mapping(skb); netif_stop_subqueue(dev, queue); From patchwork Tue May 9 10:04:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98901 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739506qge; Tue, 9 May 2017 03:05:31 -0700 (PDT) X-Received: by 10.84.141.168 with SMTP id 37mr92159385plv.75.1494324331908; Tue, 09 May 2017 03:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324331; cv=none; d=google.com; s=arc-20160816; b=0CEr3GJQibR4xMdAcdAllc48XdscbC5ftsHCoe+heTsogv7ueP3JOiti1jxsR1nKci 8xjf6oNhFcj3NcHiKk3BRnyHj6TB84vxkqHqMmTnt/bHyaRoO20r72+OHfJs4+MUM089 HWELXc08EEM4l3glDiVg+MHp8CLJsTkfXDrBJj7xvLdqGcR3aHVL4RVi6gMBYSosUxa+ tnvKjeMaBKpJxkwggr9TfhfY+Frz9NG6P+WAd7u3zbJywviwAtl1UG67a1FrHrS+UxAl JfM6FK6QDxLerix6+rRo5PT+QNztkmK3X3TAU4Rqma9pgrAe2ZFNuAMU6Zye0/6GJSKf V7Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=BVsJ4FkuOMbwM6EK7hSOujci4gxvQ4bG1W6MPy8t71A=; b=q7V3aGqmIv99zYPrCk9k6Usp/lpdWxQ7QIsM4xmGQU2867wQGZnKe/NU9t1Cbc7vqN nlEZ9yrQl6HmrSD8IgXRTrDIZD6Tv2Z/4tHR8tTQ9SJ6K4xtBeZiL5LjiqysbwXLzafe ymMooPER9apRkdH7dpLJREO4gWWpgQLLzY85+0Sgg4jqrpJk/fIQ+FrG7NxRSrlNJT7B Atq6mFOmGs2NiQt7xqClz6D8i42BcO5RODgv9cMR09qERNoADMDYNgshDDavjq/se+Bz nJsk8YPwrbBYTafUlHV5hnQWfcKNUc0iM5mChHAhttX+3mTNcp45VejGK9FHgMzIDjeR ayuw== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.31; Tue, 09 May 2017 03:05:31 -0700 (PDT) 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; 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 S1752199AbdEIKFb (ORCPT + 6 others); Tue, 9 May 2017 06:05:31 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:49558 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbdEIKFa (ORCPT ); Tue, 9 May 2017 06:05:30 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0M5cCK-1dwYEP2Xcm-00xZKy; Tue, 09 May 2017 12:05:17 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Jeff Kirsher , Yanjiang Jin , Yanir Lubetkin , Arnd Bergmann Subject: [PATCH 3.16-stable 10/14] e1000e: fix call to do_div() to use u64 arg Date: Tue, 9 May 2017 12:04:58 +0200 Message-Id: <20170509100502.1358298-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:va6qzrLZM9pT96CsZPpKXhebAC8gfwdE4/yM8VJL+2aqkSLRNS9 VXepPYzh9jXcvopt1V63KnTFvCBzjKd2HQMqtKdX8wMqM2WkE/FtqG4Q+bj2trq4x7JgJ/y 0M7e8XD2aURC7Nv9EakC2jOVC3BKjopltuis1bqAvGRzABjVMfCsQr4MvyLVd/cafVoV08j zh1bYD8utMQAicDmKza+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:9AuluDfWXcY=:F2xBi0hoJ4HpGg+GFKHdNA +WYWddijMN1pRsg8iBMZVDsnvlD2uRTuz4cktILMn+vfHh4ZGayExU+4FFqUBm4lfifT/p2ea JxFblJn0hgFq5U8EWTaDaYtRWGerLVniuw9EvhdKWZNUdXqjSDSkAB49rkYziIJf2ornRhusH lXt5a4SS6pBGrKrC+L8k8VjFNAApvezfh6DrCG5RAzF/35JAXptqHUZtFFMf+BHJNin9X5UEr KgKnrKXGw+UKZiHXFE7GIWhll/dtBtggeIuNXn/EIAWFKeooHTQJMsY6Uychl3+HYjt3uXXj6 Zcm+xhwgxEU54jC6DcMqsOrkNw3tABkyAdRVKGS8XV8UTL/5d0mkWg5f1lr4941XJ2r/VSb5L dxt96AVXFZmt0Zxxvkn6PUbRpQp+D+g9mTCHLjftpayS42uN9mb9ZcJzQpQ1EroNg/aaSXUNA ANDl9mAfrKTYDui7vFt7xbrLCu1xtKKRWnXSLamjmTHDqhl7wgUcTcv6y0x/qgBi0yaM3Eg/g dBCwLIoGiavD3BVa3yzamsVQZhyTCe3iRiQnYCiIeTybV182l7NY84a4esZrZHH8LpCbGBWR5 Kt1tv97xtRYx3eSdlZDcspLmJn7axz32X/3T4Eialtl6YL45Lg7I4DSJWovzwrA+0cOevPtUw swgyxYkYLm920adgBqBHa1ECKFPSK0dB3DylikByHsDIHDwG+DI+MAmpiyWA7qSqsJDQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jeff Kirsher Commit 30544af5483755b11bb5924736e9e0b45ef0644a upstream. We were using s64 for lat_ns (latency nano-second value) since in our calculations a negative value could be a resultant. For negative values, we then assign lat_ns to be zero, so the value passed to do_div() was never negative, but do_div() expects the argument type to be u64, so do a cast to resolve a compile warning seen on PowerPC. CC: Yanjiang Jin CC: Yanir Lubetkin Reported-by: Yanjiang Jin Signed-off-by: Jeff Kirsher Tested-by: Aaron Brown Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 060c5510b0c4..05e42d3d8a63 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -984,7 +984,7 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) u16 max_snoop, max_nosnoop; u16 max_ltr_enc; /* max LTR latency encoded */ s64 lat_ns; /* latency (ns) */ - s64 value; + u64 value; u32 rxa; if (!hw->adapter->max_frame_size) { @@ -1011,12 +1011,13 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) */ lat_ns = ((s64)rxa * 1024 - (2 * (s64)hw->adapter->max_frame_size)) * 8 * 1000; - if (lat_ns < 0) - lat_ns = 0; - else - do_div(lat_ns, speed); + if (lat_ns < 0) { + value = 0; + } else { + value = lat_ns; + do_div(value, speed); + } - value = lat_ns; while (value > PCI_LTR_VALUE_MASK) { scale++; value = DIV_ROUND_UP(value, (1 << 5)); From patchwork Tue May 9 10:04:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98897 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739444qge; Tue, 9 May 2017 03:05:23 -0700 (PDT) X-Received: by 10.84.130.7 with SMTP id 7mr10221662plc.35.1494324323134; Tue, 09 May 2017 03:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324323; cv=none; d=google.com; s=arc-20160816; b=BENHPOQwUYDkzS8u6JIv7YZeAeMGzMuSdmqztHW2sEUIeuPBSYaKOplz+FkQYUjWQm UEnILI5ugTmMzB7W8ULxc22tSkbIIefZs9IJLYSis51LEXbhPp/EzVFJb7CiOygYASeg 8UT/anCXsArb45e+E6HFmbq5MEx+pmoRDImba9x4Ph3n6VnsQl64FuvCSoeBNrQYUBZy ijrb+CnnTclXXxOFD8gaenzWtzcwZQSQw971QS9S0L8Z48J6s3eUwYfw2wz78l2+80ct wM9qrOdG6wEv3pF9gsyzrf0n/mmfUcJn9ewsFwaOqk6mN1Pnj13W77phFP2nYtM7UUkV GOAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=yphesXdy3Y+bJACqjIWAXBd9WMu+3gBriEYjG+R073E=; b=fV90R50SOFeUikMIV8/qAmGZeAYb84kKuLthH48VRRsjeWIU/JZ+4kB6X/awcW/Gqy 08WOG2FrroqvdZqWY+icCwB2AEcpoFKknfBAXfkEXP70bFDCHsb41bJXYQuuK0kIui5g BnDINM4tushS7ajy/uzV8z45T/Jsu3zNfKmCyraPLIS7/f0KGo965CcmY3kg1qsXgDqb Gr5StusSiwuaotIcUU5X9zrZtE9Eophwqsu6q4MDyVkH/LdUKmBikmSDCFtZsIrtfkm1 VaScYUpXYcFVFICsIPqu9CwzdQTKQAnn9ybq2wqP4HM5KgfLQxhYJqEHPOPZh4tAZ/55 Z96w== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.22; Tue, 09 May 2017 03:05:23 -0700 (PDT) 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; 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 S1751586AbdEIKFW (ORCPT + 6 others); Tue, 9 May 2017 06:05:22 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:54545 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbdEIKFU (ORCPT ); Tue, 9 May 2017 06:05:20 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LqY9V-1dcOx23knJ-00e7Zh; Tue, 09 May 2017 12:05:18 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Zubair Lutfullah Kakakhel , linux-mips@linux-mips.org, Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 11/14] MIPS: Fix a warning for virt_to_page Date: Tue, 9 May 2017 12:04:59 +0200 Message-Id: <20170509100502.1358298-12-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:Kujrc62gdGYyW+7JwWFYLMRM5RXZuDYDrsFN8VktU6v/pTJfGTu WCYRNYBU5EQ2T7FEiHzun/RPmHt0zrUdutrehwOmIT5ZZ7mwt/qxiJQj41wNfZ28UxZTdWv O8FTp/6LiIKbufdU4DhxYyof8bvRatQ0QebvxmG2blB/ryNz1Z40SrjeRqViUcrnkWn6oYN TeS3doN60kLiqFYHV4NVQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:YeXBJDQ8A4Q=:PIwFHhR0wP3RiOcQ9g1Fl8 v8/YqmwyoS2ObZKNDBHzHMJQTxBIEIZvYa4Ux6tK5kqrY0gI5TjWCsgJ22ICllEuZKzrmm69c EVobHvm5sRrZQfgn0TsGqedhY542ExPzLtm8nSouj2G12pOoUx/TM7c9JuMx9z2EdhjzkOOhN icRVhpnHDgrsace1DT8QifsZ7tIhcvMQhrX5Q/IB7uHA09FpOXLpaRCNVZF0PmtfixvQbBooT sKmFgaCWgUhmO7WgU7449Qvo+BiMFMX5Q6CpWq/0FjS/4dygGS9CnDQwiMtrbfp3mIYLgdRfs Yazx6A5qbBEDh16jAMuA898gdfqmo1m+ml13/oerpbgX35otCMmYYo+8NUXSdc/2egFFZY20M r7QACG5vDJktHatyTS7ebTMWOrS92lVB0xVN1fZ1en3pMkj7Vxv9AQpDUvu2QqRzlwel9UBl1 IdnnYSpYMrNnVeKIZ1mHAvlRQUibJmLBcu7+kSO3BcXzFy0StS1Wk7R4k3B84+FzuvCZQyfuM EGPhRlDIRP3jpeKyXLQmvwy2uNUmQOx2dgFQIXBIGQrVHNZO5kjzNJhUA+8lpC66rnl9nNDKS fjOP+8d6YZz/AVbhcvoLNxqU+dPhMUFbsqiDiBVgnt/MhGB5O0dUeWyxUqWwwBKMyqRrwaLZP JpdrNF/EyDsSmp7H2JxZD7QwMM2pyo+qHrpUgW/Lu859Jb7NaDwOhsN/ZNiLbiydj0FI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zubair Lutfullah Kakakhel commit 4d5b3bdc0ecb0cf5b1e1598eeaaac4b5cb33868d upstream. Compiling mm/highmem.c gives a warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast Fixed by casting to void* Signed-off-by: Zubair Lutfullah Kakakhel Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/7337/ Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/include/asm/page.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index 5699ec3a71af..fd0347da36df 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h @@ -223,7 +223,8 @@ static inline int pfn_valid(unsigned long pfn) #endif -#define virt_to_page(kaddr) pfn_to_page(PFN_DOWN(virt_to_phys(kaddr))) +#define virt_to_page(kaddr) pfn_to_page(PFN_DOWN(virt_to_phys((void *) \ + (kaddr)))) extern int __virt_addr_valid(const volatile void *kaddr); #define virt_addr_valid(kaddr) \ From patchwork Tue May 9 10:05:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98895 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739442qge; Tue, 9 May 2017 03:05:22 -0700 (PDT) X-Received: by 10.99.3.208 with SMTP id 199mr23483081pgd.43.1494324322366; Tue, 09 May 2017 03:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324322; cv=none; d=google.com; s=arc-20160816; b=BhgxNiBoJ+B1o/Sm1qLD/OuwBZro32Om8q5i6PEe1oizszuvFj0YuYa8rufM8FYzl2 CZnpPAPLVXVyAvsjpauL8ra0BwsgVrW58KZ/GB69RUnSaOW+2CzzUidSflhOuINyhVep SzIYwongD8ZwFyMz6+YWYMCeeOJN87FRakwVQ5V4hQFcSORPu8IV1DUuMVBMcxKCUfs2 ZL+9n5hTteiuPwX5gDF0hAoz1yCDtnAMdiv4FtsaFhWpc3WapZTYG4Xn3IB64YaQCJ5Y L+HQPY5Y5P35SBy1dFoyKyIPh1JrXU0ki2noHl/nvs5b0uT+tnwQRNFbqE7tOQbyQRPn dsVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NHh6C4yQTTYXP65A2jAtpjXU2WSrU8LAsrwENY+KHN0=; b=pY/FgHPNXG00tVaVEZwPRpKA7s+QkVRzcTPx3lzxRwHyrq4YbYarZE/UsZ3cqDlKBO /cA0cYGkEOQMmZeqtC5o5nTpCfyAx1fV+JABsCb8Hw/g+YlMRQKE8MLRRYBQHc8zjhx5 kmQVcpeYHUB7lOF8Yl6s0dxRLMd2qqJaq85eqXxM0K3bTMY8IJ6jpdjbMf/1ojX6Mf1q H4syaqzgCCgqCtc4NmaqKq0Uzy6L43QMADO4zV8qSxEGXf8OYRhUXvp419I4SAtxdJxA gCXzdn5V7ub8yjZwOisTk80btThXyBzx28XsS9tX+4GvBhueIVkPJi3hO5jnLgGswyFp 2AWg== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.22; Tue, 09 May 2017 03:05:22 -0700 (PDT) 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; 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 S1752139AbdEIKFV (ORCPT + 6 others); Tue, 9 May 2017 06:05:21 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:57891 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbdEIKFU (ORCPT ); Tue, 9 May 2017 06:05:20 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0M6AQg-1dx6Si0cws-00y7ZK; Tue, 09 May 2017 12:05:18 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 12/14] wlcore: fix 64K page support Date: Tue, 9 May 2017 12:05:00 +0200 Message-Id: <20170509100502.1358298-13-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:onc3oQP/Pu5osgLkdoWJpyerOKs6WVeum6wIswt9BwNhxcF4/no POjo4U8IP6z+wCPSR0sZNZse7t0Nea3wiRt12v511vix5E0s8Fn4k+W0wp1Ffyka9p+WRwr 1FBTMqkfcJqI/k1maJ57urDb2n8f2Y3xOZcJsPw7S3pSoMUNLzfsx4B1AnEfzF8thYLWU1N L1hGIAesrh9rt7tGxjTfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:AdPz3RpFHQY=:GOl2frtvdK6a9imfsBhO30 Ec9F9E81skLyPD0bulftsPCvUdD6vKkPw+Jw2GXApboBvvMwztmhy5fwZ8kqJ7BYvhL1amLmM HK3xonToUybXQvGQX2e0fQgAb79utkJAN3IlmpbhjtVwkHvWyDUgE13m42rufr7qmpzRbyB/q I3Yf+SYV8nYimzW0ii0Ggl5H+XtyLhgRDU32ICdUZ7+4el2ZWPfA6ToqwuQWhnDt3XS6ISOH9 zxZrSkQx7qvJ8oSps6ofaWY3Vcyipc52l53mz4t/Lu8NG++mOdHzO24LGzJO/dzWEpJacnW5m Xrqecx7qnaGef8Ut17dEtSOUsjuS24j04HI2eYDlinZZkNnoLVPHZEEDTPxu08xIn5ql1Ruu8 7FTkiKNfaO9WrGbl4VTjGDTqt+6kzwDxR46wcOcE5sPifZ1nc1ERswQ6QHjhpRQ/T4+qrvDpp WnitzEh+dh7cfbzADJ0UVQLtEfLHbkW8m9x8fXNa/M5tgIVbf565WjKdWQ6oZHMy+Wapfs83R IQylt//AD0J7rqnC8XPGnL3mK6gzf1PDRPg6cFVS1PWaLx00fGtW54IU6PuIxaC0XZHReh/Q0 WRzHAYmdcb55TOKOA4MCnATAv8QMErwnKItra6VQeR9D6ml3OTzWkP6FCFL0B3Xi3TDTMqk4v 5RAIKRI8FitblRLu68fUjqAvZiZ9AoSYDCGOokiFxSM18/AWHg3ZgMkpYSTe0Co0tiJs= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In the stable linux-3.16 branch, I ran into a warning in the wlcore driver: drivers/net/wireless/ti/wlcore/spi.c: In function 'wl12xx_spi_raw_write': drivers/net/wireless/ti/wlcore/spi.c:315:1: error: the frame size of 12848 bytes is larger than 2048 bytes [-Werror=frame-larger-than=] Newer kernels no longer show the warning, but the bug is still there, as the allocation is based on the CPU page size rather than the actual capabilities of the hardware. This replaces the PAGE_SIZE macro with the SZ_4K macro, i.e. 4096 bytes per buffer. Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/net/wireless/ti/wlcore/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c index a460fe669443..48559a5baffa 100644 --- a/drivers/net/wireless/ti/wlcore/spi.c +++ b/drivers/net/wireless/ti/wlcore/spi.c @@ -71,7 +71,7 @@ * only support SPI for 12xx - this code should be reworked when 18xx * support is introduced */ -#define SPI_AGGR_BUFFER_SIZE (4 * PAGE_SIZE) +#define SPI_AGGR_BUFFER_SIZE (4 * SZ_4K) /* Maximum number of SPI write chunks */ #define WSPI_MAX_NUM_OF_CHUNKS \ From patchwork Tue May 9 10:05:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98896 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739443qge; Tue, 9 May 2017 03:05:23 -0700 (PDT) X-Received: by 10.99.125.29 with SMTP id y29mr23935647pgc.163.1494324322641; Tue, 09 May 2017 03:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324322; cv=none; d=google.com; s=arc-20160816; b=kqQm/TqJXw7PxDcUg1cmdkRhseYmfp8lMpw+dejUeG8t+NfgjdXEStPMtkIESXVunI A9XAuEec9YVbfbYIx2JPEyBqsSsY3SfLymPIaZA353JW2XTm5FTSntAmWAJ+ZeQ26vQ2 R78rpFcgwWJTRkjhD9uDcVeaO78w1NJCna7rE0nv+mdcpsNxKcCtyGkAPaNbAwZiwfqz mib289qrTd4po00//m1W2locExsL5e/FiLtsAflJCba02mqa5NbgRHk6Egy7Z49SE1GT 8HwJEBdbZzTvXjALft8rZxdaeea9dKHuQoTgdRwKOypkIolb617WV+N0O6crLcwHj1SZ 3yzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0gzkNTle7g459ltxhVhZucrLQVw3F8VrmXCW8QsvgdM=; b=i5qGYg9U5bo/nXuAbx27YKqzTjhI5fKpEKV8x+WNwCJj229ghx65mqWgFN4jF+Ig1c 5kC8axW6l5dtNFU98mcTxP/QBnYY/IgswpxYsRQc8NxB9r45bTi1cLarl8Gw9RT7iD6f kqSzM7kiUggRM7ayTBnhKw7nQuX2mlYT8SCxLfRyiSy94x0lp6NBZynUMBSLQhXnkQdp r2Dr3YfrK4xIMsZwlLvBVNFzsVpi0cZhH/5/8fNI9UF+Uv0RRbmfMcyL8q10E0Ce810+ fDQXZYaxjkC0ZGZJ8FE7fYSFs/Nkq3BywxU5wewOZY/whkQc/e++2GCWgzL1XZ9rboUQ ETlQ== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.22; Tue, 09 May 2017 03:05:22 -0700 (PDT) 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; 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 S1751343AbdEIKFV (ORCPT + 6 others); Tue, 9 May 2017 06:05:21 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:55574 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586AbdEIKFU (ORCPT ); Tue, 9 May 2017 06:05:20 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LroR0-1eBRwm1Zcs-013blG; Tue, 09 May 2017 12:05:18 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 13/14] net/xen-netback: disable on 64KB page granularity Date: Tue, 9 May 2017 12:05:01 +0200 Message-Id: <20170509100502.1358298-14-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:Cd2jf8dDMw788JwrwI3D2xgo9FK1SJs8gukJdXtTrSNqAEXMJWe TlWpuPdP6anadeuTcjEBim9rAZQ12K7e/Z6W0RVQUCJ/bu5Gip2N6gB+dqmEtDFiWfOrnYc iC39/8twN8ZkuCdX1ETQhnP8rci8dfekoZw3z/bbFk7cHJReffKfjLMQTifdBhWcDFFQZqf u/IaNSfEjrm+N9kBEHlTQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ttvB8uKN7X4=:OOHANkJQrEm6RrqQdi0+O/ 0Pa7LrEbNyHspQc5OkvVXIDzgVkIB1O0zJoypN2RiJyy5fZoCtrfCHnLREiwKpQDc8XBCc02V EDcaf8Xx4wy5Dz87cUGO6f2vmkn0dSyqo/uitA5GfSnntTPO2wrrLBOUlQ2bh6s0FnNsnCMZl gOzPYE36GhhCGzhL6VuUa0+qK1vD4fXGhBQqJTqD3cqWNP8Rr12IoK61GedcNfh7NYLkLLqCv fkpfyuK7aqcGGAQFVF7RBcXrKg8I2vAqiDV0lxWjvJRUmzDtVzPOmVjhQKhYi7qZltjpiGTNy FfEKjpOAbBDeMHsew2zN2fPeEOMq+8KTlk4WFC8wOnjc3JM/c19EnEbqPw0YA+ck/K66rY2/X OmEORSmN35vEd31pFDK8oQPu+m+fNWc7GqnD1c2QGKexmxqyOvMknH7lany58uICFKIWyPP1o tcNyFGToG6HYrQKyfdQYtFWY26DU0rJ4CTmVhNTFa2NePVCy5P81yUKWRZlr3TTCMkPWk4+zZ wad5fPXzZdX2KXw7DRvKk7rzao/hp82wigbF7TeXWBsSeTRhayqGzEgpab04JX6TJIPIK1E1K b8QXRh7HDJ9AI/EbyiMr6+zEMSQRE4L/wWgPY/sGvHmH3MEN1BHI7zI4oae8csBtcDVvytsgi VjbFQDbHLUkVQrAET3xGKuXloGsduxZvP2APFh9pgUlirMIsrLmtZLjtEs/pScbB9dCw= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Building the linux-3.16 stable branch, I ran into this warning that shows a serious problem in the xen-netback driver: drivers/net/xen-netback/netback.c: In function 'xenvif_dealloc_kthread': drivers/net/xen-netback/netback.c:2002:1: error: the frame size of 16384 bytes is larger than 2048 bytes [-Werror=frame-larger-than=] The bug was fixed in linux-4.4, but for any older stable kernel we either need to backport that fix, or not use the driver when the page size is set to 64KB. As the proper fix is way bigger than the usual limit for stable backport patches, this adds a Kconfig dependency. Fixes: d0089e8a0e4c ("net/xen-netback: Make it running on 64KB page granularity") Signed-off-by: Arnd Bergmann --- drivers/net/Kconfig | 3 +++ 1 file changed, 3 insertions(+) -- 2.9.0 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3fdfe317a6c5..b7e2fb72578d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -331,6 +331,9 @@ config XEN_NETDEV_FRONTEND config XEN_NETDEV_BACKEND tristate "Xen backend network device" depends on XEN_BACKEND + depends on !(PAGE_SIZE_64KB || ARM64_64K_PAGES || \ + IA64_PAGE_SIZE_64KB || MICROBLAZE_64K_PAGES || \ + PARISC_PAGE_SIZE_64KB || PPC_64K_PAGES) help This driver allows the kernel to act as a Xen network driver domain which exports paravirtual network devices to other From patchwork Tue May 9 10:05:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98898 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739454qge; Tue, 9 May 2017 03:05:24 -0700 (PDT) X-Received: by 10.99.125.29 with SMTP id y29mr23935832pgc.163.1494324324764; Tue, 09 May 2017 03:05:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324324; cv=none; d=google.com; s=arc-20160816; b=EVwY0ZZiXrLN574hsJx1cmIORm3xNRQWov079WFBHrnO2zgc253WGSJojic6RXIqMD /d6I08QmTdGfe9hXZWKOBdzUCeLnYm6iu+nvvpMxlD9kVkQQlA64OQsKe6pf7Tka3Jjg ChfJTYUE++wezeuQ2awB1rcFwbLTm3590wr0f1q4kGHgaK3HoM9pN6E1CwsynMSjs7bU Q4msk6IXzjGTtHpJz4r33m8O/skzwYMbB2VcbHAdjoRhRG39GLNGv9EQnHiIsV0cw/kX pItAc0Q303NMt9lqpjknpFtVFdRP8KA+8QQ5w+g9bCuMlKsWdhf3Mjjn3W4Hkh6tQbf2 4apQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=u28NdCdqToqtsjR/U5gbkikinlx1mTccqWmiXitpqGw=; b=oCxT4+RcIFO14y9VBasWWL9kPqHq5W39e5ye+RUwksGdXKTU/tbA3mrYpv7ErIawPe ELk4X+DyDfxcYqoP0Gn305ROgZAMzU24wVay8nrdKKoOAgg640M93xPbUkshMepDbTzY 3gGEZbXTy4QXVc1IRsjBwUImIq25vAZzOw7pHx16rXR8VZVQ67I7RmoqBqOBnwuAXSQY AzNmuevzQSsEhINSelbcfE0RbmZ0q90pHz1VoXOg5SIcZ9va+xUtkcnWKFSB8Sseffcc Pg/u94QG0lxvr6B8eO8R0s+CZrpvMKBfHyly8oT1KNUzSRTsLrziC9AB30Eut9iBo3dI b0wQ== ARC-Authentication-Results: i=1; mx.google.com; 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 h13si12805392pgn.51.2017.05.09.03.05.24; Tue, 09 May 2017 03:05:24 -0700 (PDT) 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; 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 S1752155AbdEIKFY (ORCPT + 6 others); Tue, 9 May 2017 06:05:24 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52272 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbdEIKFX (ORCPT ); Tue, 9 May 2017 06:05:23 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LgtFa-1dn9nV1ifW-00oGjG; Tue, 09 May 2017 12:05:19 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Ard Biesheuvel , Russell King , Arnd Bergmann Subject: [PATCH 3.16-stable 14/14] ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode Date: Tue, 9 May 2017 12:05:02 +0200 Message-Id: <20170509100502.1358298-15-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:wrSpweiEKX7Wb4pE/kgwv3wZPL/Ho9Ant6tFRQjFLvZw9TMN4AR DNGlfM0i+zIGD4nkUi2vebg9sVn/88NiqLjmmywvcnkeU/5fgi6yENk7+P1EgwmprPFl0yJ FeWYDrf/GUuYd3VKjSol+rJ7soeSl4GqWMl4wQPBCpXPmG7l70CNP56iLwftWATPPILIIhx TNdMDpmTLZa95maNO9wPg== X-UI-Out-Filterresults: notjunk:1; V01:K0:7jfCCZfkCVI=:CAVpU2R7mCFSJBM92XEiUi h7Hn8XyohgLGfmzJhhhQFzq6GY/zCz8OLGWnELjOTKrAfvS4iYt7JqgQg9bVFzpZZaAWycWvb hQLbA4rjKEISCa7BLk/vlNxAL5Iyjc9iW7cjFdy1WhlDDfS6jLmsziwo6hPaHtT4hpx9YEzwS YREBOrqGokv5KzsXuZD0uG43vPMbEGgcULUYj8E31bwtwmr30mOWWdq5aXd2nnuSpuGQh2zFO PlZwceHWlwLsso+fK5WffTX95hDAi273wLqijiTtIXBpuSydUeXs50/9woGWxMOPGSIa3/R4h 2WJEiqKpdEkIxD6RA+4TmuaW4E2JmN/CRaJVPnDWBNMpn2dpRp0NK2/AW2sHdqRDofUY731z2 SHTCf29qzWPJLI+tuy7G+xr1v3tl2LjUxsEcDD9tpDy3oT5vm/ReoWeAADQhyMJ7MFL4jXBoJ qo16TLkc0onB4iIJptFVsWNy1ylWLxy5Eyu4WWzEzI5aSMZhe+jiEIr6Lk6lScwoRh/BEeAfa 6ycJMZ68Vu7p6ejYiqYymZ5GT/ZtYxYPKrbG1l31aiVTFPmD9I+4iFKFqkuagwbTvVN69mHTH 668r++0eSjS9FWe2D5GbGsI5B5Y0ht3UehBcmR5+NR4fXlPykmREDLA4LJk8aN43QCvCWQ+XH 8pil6IUxDmya7r/rVDuGfloKOUm0kC+PtPY2UIOuz6ZYMcivGIUs3zu8GHMYidvBc0gI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ard Biesheuvel Commit 5008efc83bf85b647aa1cbc44718b1675bbb7444 upstream. The PJ4 inline asm sequence to write to cp15 cannot be built in Thumb-2 mode, due to the way it performs arithmetic on the program counter, so it is built in ARM mode instead. However, building C files in ARM mode under CONFIG_THUMB2_KERNEL is problematic, since the instrumentation performed by subsystems like ftrace does not expect having to deal with interworking branches. Since the sequence in question is simply a poor man's ISB instruction, let's use a straight 'isb' instead when building in Thumb2 mode. Thumb2 implies V7, so 'isb' should always be supported in that case. Acked-by: Arnd Bergmann Acked-by: Nicolas Pitre Signed-off-by: Ard Biesheuvel Signed-off-by: Russell King Signed-off-by: Arnd Bergmann --- arch/arm/kernel/Makefile | 1 - arch/arm/kernel/pj4-cp0.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 2ecc7d15bc09..03120e656aea 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -84,7 +84,6 @@ obj-$(CONFIG_CPU_PJ4B) += pj4-cp0.o obj-$(CONFIG_IWMMXT) += iwmmxt.o obj-$(CONFIG_PERF_EVENTS) += perf_regs.o obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o -CFLAGS_pj4-cp0.o := -marm AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o diff --git a/arch/arm/kernel/pj4-cp0.c b/arch/arm/kernel/pj4-cp0.c index 8153e36b2491..7c9248b74d3f 100644 --- a/arch/arm/kernel/pj4-cp0.c +++ b/arch/arm/kernel/pj4-cp0.c @@ -66,9 +66,13 @@ static void __init pj4_cp_access_write(u32 value) __asm__ __volatile__ ( "mcr p15, 0, %1, c1, c0, 2\n\t" +#ifdef CONFIG_THUMB2_KERNEL + "isb\n\t" +#else "mrc p15, 0, %0, c1, c0, 2\n\t" "mov %0, %0\n\t" "sub pc, pc, #4\n\t" +#endif : "=r" (temp) : "r" (value)); }