From patchwork Wed Nov 27 07:21:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180253 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735581ilf; Tue, 26 Nov 2019 23:22:07 -0800 (PST) X-Google-Smtp-Source: APXvYqxrf5obd/86xOqTJR2uEZ3BkMoPtUjTR8jb145tf0385RSEad2ecI/+tLrdF2BX2zvHxopT X-Received: by 2002:a17:906:1611:: with SMTP id m17mr48609615ejd.281.1574839327267; Tue, 26 Nov 2019 23:22:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839327; cv=none; d=google.com; s=arc-20160816; b=NVVz+oJRgSUYsyWrHbrjSozC3LiX978OOqrNLGQjChs+hmygcOnq2rXtcbluh440Ia Fdc5I+XpkBTahlF3lf6plYznL/GhI5FLdaBBWj03ZpBdyRobVlRSaXzb99HLVOsVZRh2 I7VA61IL5MqVjyGUzuaMgwWbF43DK2FwDJLMQ2BDOOUxUJfDbyzEAxBjDhB+BKfTlHPG 078NpDjs5WTVu+rqGXeaJswTzeSs0YgKpNp4XWO9ayc3FU5+23LBdR+xopnLXsj1c8IT cL8zhdpetuszzB3UBZfblzwTE/c+41Vd87AOxYW9qomMyr/Kh4hFPqQA2ggNQx0ZBK6N s7DQ== 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 :message-id:date:subject:to:from:dkim-signature; bh=UWRbO2P7g4EPCMmLRyVjfEAuVW+/g1Ubr25lGtwVdcY=; b=TfeY82O1yzgT8eSaQLKHt6NsC094Ks2s0SdzYR8Vv7Ub00oOVKKfsB05kXw+D7S2Dh WeHKDiGNoF1fBaZhw+rKReg/DStCsZOgxEbIVahvBeB3EBjslFOVNi/+lvcwa3XDpv9U 5Psri2osafvLABlF6mKo/B1WB1+2jnRdycZCIXmA3Ad2j0IFyX4k4OgxboZkDWgl/nKz GQGKPVrGNyxAlRhIIXWUfBzHA37iQYPXYvVO7cNf1/Vp5yOrhpsFQZav+TfFewUCixSj 1EYWiSM/mxMDT8XwCeHyZB06wrRxfvcyPTNSRL/TA2iJ93g8fSnn0w+INbGpxe3KHW0Y Zg4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PkBawT7c; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m19si69058ejc.66.2019.11.26.23.22.07; Tue, 26 Nov 2019 23:22:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PkBawT7c; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726426AbfK0HWG (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:06 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45865 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726373AbfK0HWG (ORCPT ); Wed, 27 Nov 2019 02:22:06 -0500 Received: by mail-wr1-f66.google.com with SMTP id z10so25275799wrs.12 for ; Tue, 26 Nov 2019 23:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UWRbO2P7g4EPCMmLRyVjfEAuVW+/g1Ubr25lGtwVdcY=; b=PkBawT7ckvErv66yavO79Cb2B9m+9s8C+5vgtgN7tImRaIt8Sk6Y6hKdUjFaM45u8o PCLwrOlT4IzF/g2foIHl7ECmt0WEtQR12j2P+R4ac515t02D762zZ13ZX+QeI4QwIlVh 2AxlFEXW9qV2cQ3q9Xf3emNwP4oy5IqoIVhFjskKTpMeyPPbFEFDc/+ugb6cIDxI/pDo uJ5pJHEtWVD+jVhZZX/YL9IHtTEWtvUTsRyxpGpvbtlgqZN4WxOmR/etCG89B+Sxde4t DXAmKZJj0C5KsfvtaRvq+MvWhvcU0BsR8e1I3aql67CeGOTaJNJG8YCL5jXhOfklHF2y MbhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UWRbO2P7g4EPCMmLRyVjfEAuVW+/g1Ubr25lGtwVdcY=; b=n7YqxdnfbFpWsDp4pUcT0fj5+yxxL6Gw+EHX3vEXv2C4oseepUfqqP1NPDrbY0QgGw seK5yRxPIdzAOrUtmUenBl5zvbNLeDVRQBws4w3gA8sEPG2iTiyY00508YqOtww6EdeR YIgXX3NpXGECbiydFsJABEb7DfGjOgnSbi1zjUjIU5DO0zk3qGZkQW5MKvvIUlaJMf8t 5CUb2gHFtDIX4qT2IaMRbyUIziV+9MRTTy63PPEdvsXjrNHdGhG4TXxNNJ0Yg0sqxpe1 MklppyyG/b5DInD5ZnBCsbI1QdUhYNWCpnAf7qLkpYrVjYHHLeFLnnw8hAnCqT/9ERz+ RFvA== X-Gm-Message-State: APjAAAWuKO0f+ulSSduMJppOc5ryvqAcWG5BrldOL+39lTfT4vaEDQaO dnO4nGwq0gcXTrBl2+M4Py/L5vqdKMk= X-Received: by 2002:adf:eecc:: with SMTP id a12mr29427632wrp.363.1574839323938; Tue, 26 Nov 2019 23:22:03 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id e16sm17983130wrj.80.2019.11.26.23.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:03 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.9 1/6] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Date: Wed, 27 Nov 2019 07:21:39 +0000 Message-Id: <20191127072144.30537-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chester Lin [ Upstream commit 1d31999cf04c21709f72ceb17e65b54a401330da ] adjust_lowmem_bounds() checks every memblocks in order to find the boundary between lowmem and highmem. However some memblocks could be marked as NOMAP so they are not used by kernel, which should be skipped while calculating the boundary. Signed-off-by: Chester Lin Reviewed-by: Mike Rapoport Signed-off-by: Russell King Signed-off-by: Lee Jones --- arch/arm/mm/mmu.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.24.0 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 241bf898adf5..7edc6c3f4bd9 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1188,6 +1188,9 @@ void __init adjust_lowmem_bounds(void) phys_addr_t block_start = reg->base; phys_addr_t block_end = reg->base + reg->size; + if (memblock_is_nomap(reg)) + continue; + if (reg->base < vmalloc_limit) { if (block_end > lowmem_limit) /* From patchwork Wed Nov 27 07:21:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180255 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735612ilf; Tue, 26 Nov 2019 23:22:09 -0800 (PST) X-Google-Smtp-Source: APXvYqxQCJeBoo4V6lSuSyusmH2TXqwfG9XYSHiJvBtBF7nYD+4PNoM018JNVedMESNouNuFwXKb X-Received: by 2002:a17:906:11cd:: with SMTP id o13mr46973612eja.272.1574839329248; Tue, 26 Nov 2019 23:22:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839329; cv=none; d=google.com; s=arc-20160816; b=IJNwpr0jDLPLB+mtXt7F9uuK3+FWFtrtDxc/45tFzo9v0L5+qVFZyW4WMUdTKdrbr4 xP4sWSNokyXAXF21Ub9w1AfAGikhxZqzHwOQDvbNJazTM2w3WX+UNie+pD6IQ4rqtRlk jMKblhtkoD+OVcrINZvpL/pJZWzFfPa6BfP4W7lG9QeDkgcfCLLiSxIGPP/USCKLPOSu vrgc8zr5cAVbMiS0IgnRTsrfoKeOG+5yXeoO2havHudfCKihmDRNSX9eGHkHVRoTSVmV m2e0my01YNUM9we/GB+w4PlZODG9jfj/NFmJDzYchWi56uvxBBfCpEwNLDUeezNRlnld PvKg== 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:to:from :dkim-signature; bh=Ul0WaU2BK0FC/8xcRvsdqtFzsbZwWd8yC4dUM4MnqUo=; b=yVnTcmLPEBorYwXiooasI1Mn9kRIcs14sUh8FCRqAIzRIMXpVa3d8XxVXVuzDNzFEK a+28flvrHvBDdGW+ABdqJYKQk+qzJCFk4FgQFLTU5jrzqZQyqLaTJeH7+WDkbZEJASOP Tq+7GKCIZXH5epYUOBYBZdV64vRKbl7dTL+DPQgBUQH1VFs3H6GJrH2kuCT8oIDLQWUQ pv1rVsvgjGE7rJOp+Tq7cPKCDb9rEtNAE6WHHkzJMD5D565YDlDVCc2SEtEe/2Zlsyy0 smchRs6Wqfoxc9NpXaYD+j3/9gFLZIK3g1d3mlJ7HOkblNE7HUZ65XKrc4gd7MuYB+8t 4++w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mcv0jv8B; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m19si69058ejc.66.2019.11.26.23.22.09; Tue, 26 Nov 2019 23:22:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mcv0jv8B; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726320AbfK0HWI (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:08 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38003 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726373AbfK0HWI (ORCPT ); Wed, 27 Nov 2019 02:22:08 -0500 Received: by mail-wr1-f68.google.com with SMTP id i12so25434327wro.5 for ; Tue, 26 Nov 2019 23:22:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ul0WaU2BK0FC/8xcRvsdqtFzsbZwWd8yC4dUM4MnqUo=; b=Mcv0jv8BKLmOSKZyyRBh6DX1wscLdbqydAWtEU8rZlagKyMYSBZaZw6JdngDoIojma iN6tyMxNZYbqEzuF5UwmnYXclzTashowjGZOBMzwF3vcS4P9pL/CC/jzNK3mMMzJj1hY nqOorXf6bBBYZhnG0kenwKkM2PTOwcVhRNEiAUw2XkyTaxna0wTOPbxN944so0gQFICR +X/GYjAlMYNDMDOamy6bIKiUGxZSeg96+6a8wsUKnVEPs2x13d8qKYdvgCGcZAkz72wv yDUZ2WFYl6pB7CmpThyEGpqVVSdyQP8n8dV2WCfWfAU74DDzVhSjKuRJaDPdYKKJ8uko 3cUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ul0WaU2BK0FC/8xcRvsdqtFzsbZwWd8yC4dUM4MnqUo=; b=YQpRjqK/aKmlKhqCNqzOGKOnXamAlFzqQG6UAeDLBMCsTezNBUm4I+QMV/kq5yEuw1 siHXh8QL7vDTy8KNF8VsF/Z+Beko8AZm7X4k+xVeUc4I/MZb5NNP/WN//nnA2qYmG7/c uk0BUpNVN9Bsq3IHWO/6KjbbPtSP1C99Q6osVeJOdvIV3Ox0kRLe+0tSdMrJqAdzz+XR nK58tuLYVCQKRNIHSGzvKbxky+x3NpgT50bcPh5Jxhsm3/ZaSXvhBvWqCgZoHHlYDiNO ZVWwO0xR67T1deNU7g+oqTUBiplzZ4oBNhQ8e96Rsloju/XlpVAMdAGfFP93ACmMwnJy BmLA== X-Gm-Message-State: APjAAAWUiCmZpi16qNWL+Q3Tezwy9I2W471aFKhn0hnGHTolKNXHGCOb n8eOKomqNlwwYjzm/rhQNRZKYhwgY+w= X-Received: by 2002:a5d:65c4:: with SMTP id e4mr43704430wrw.269.1574839324520; Tue, 26 Nov 2019 23:22:04 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id e16sm17983130wrj.80.2019.11.26.23.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:04 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.9 2/6] can: dev: can_dellink(): remove return at end of void function Date: Wed, 27 Nov 2019 07:21:40 +0000 Message-Id: <20191127072144.30537-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127072144.30537-1-lee.jones@linaro.org> References: <20191127072144.30537-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Kleine-Budde [ Upstream commit d36673f5918c8fd3533f7c0d4bac041baf39c7bb ] This patch remove the return at the end of the void function can_dellink(). Signed-off-by: Marc Kleine-Budde Signed-off-by: Lee Jones --- drivers/net/can/dev.c | 1 - 1 file changed, 1 deletion(-) -- 2.24.0 diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index ffc5467a1ec2..1b3d7ec3462c 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -1071,7 +1071,6 @@ static int can_newlink(struct net *src_net, struct net_device *dev, static void can_dellink(struct net_device *dev, struct list_head *head) { - return; } static struct rtnl_link_ops can_link_ops __read_mostly = { From patchwork Wed Nov 27 07:21:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180254 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735601ilf; Tue, 26 Nov 2019 23:22:08 -0800 (PST) X-Google-Smtp-Source: APXvYqwX6Q7texOtK4pyIxCpBQm9MGyNSkFXRXiA/cSNVoJ6SG+d+MCuV0pjqkgACBrYSZ/pawKj X-Received: by 2002:a17:906:b25a:: with SMTP id ce26mr46988254ejb.13.1574839328412; Tue, 26 Nov 2019 23:22:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839328; cv=none; d=google.com; s=arc-20160816; b=ZWpsVz0z6rRvVq2wu7Mdl2U3Jgab2Uu9jmUFlOW+gGVGKyUPNST1Eff7lHo8HBDe6n UOzLVu8yDn6VQ/OyKGYuVbfYU2ArnvRDa8a9zyX3iuJIJZfg40ieTyrWyaRAGK6ouuoE /bVn49Zlnk1Xt1KDf4wGJbREhloM/2QQMzxXjHL56li78/jO5SO2KBRyee/rjyWIoPHD PskoOHEbuPeLJIDV10fI26eDt4j1sxpi7eI9ZAchZxa9I48OWUTwgzCVsTCnkPEBzHPs r/GUDw9xBf1GQ4Z4QyI0pFhci9dOOR1OG80OdLIAQi7IO0QhPfahrNaLP2j7r/j24cJX 7usQ== 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:to:from :dkim-signature; bh=aMdmhI1a3eYH/WVtmSydJcMj1XByvjyqY+PnBFpibbM=; b=BmDHZ9cKEbeuejMapXn8mryunfu5cHaO8Rs3lUn0E7ipykrHL5mEnDQQfc0DVEML68 PxRUyqa28IRlzo7BkmaB0EuDUncLReONvouIxZTu361n1FeJh3LiF7zjhTq9L2aNETet OO7ujldGv1hXgwmKCtKPv0cSTll/aZHi0PizXSg3fhgk1WtkUn6Y6FBRGUFu5nDD2dj+ ug4WjnrJ4azE/dhSGhnlZA3Sx7V1V8ltkthlkerdEGNbAS8wWJEWH2HmSqrJvKg3mXAC CVmdbUJEdoC/Z+Zam+IRS2Ce3D3mpZ2Iv09/GCAAiFqHQWpMxBGqajQ8M8T0A0hUIodU r73w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LLZaJFtb; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m19si69058ejc.66.2019.11.26.23.22.08; Tue, 26 Nov 2019 23:22:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LLZaJFtb; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbfK0HWH (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:07 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39459 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726383AbfK0HWH (ORCPT ); Wed, 27 Nov 2019 02:22:07 -0500 Received: by mail-wm1-f67.google.com with SMTP id t26so6147693wmi.4 for ; Tue, 26 Nov 2019 23:22:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aMdmhI1a3eYH/WVtmSydJcMj1XByvjyqY+PnBFpibbM=; b=LLZaJFtbEGV+rlO3FJCGbAUCCKQRegFJJ7EpzzHN9oXXjTwIXOONT3+P13pF9mTnM6 OBKSr2nYX8DGaNH2AI0tbRvaJULHmasw2pd6TWbAmN3mTx+2ym0Z1w4deB0pLxcG6hq6 d3Fp+CR6NQmkGIzwaGEqF/7vddiPicAJunT/7uVF9vT7zRdSyxT9yww0XjIgeHdxeDe+ b85vQK8yCtNlUG5e4quSZF+1qLzDOiN2S93OgVH/ot9G6Ipk/3YytQfxA2WITeRuccEi t3aza+rxNJx2Z++0kOctYvt1xgq+SZXzaSqYtnFHCfmzuOD1/HWOIM1G5GBr/efLmUPc qA2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aMdmhI1a3eYH/WVtmSydJcMj1XByvjyqY+PnBFpibbM=; b=CfaM1R18iGyMtrKgcszfZvlvxxXM/S9KAx7tvV0EYW1dPmnskQazJBQ9oblOD5ZXr8 XMHHtB4SIaqjvt3OOxFqf4POLaAMdYyK5ekZiipldM4iVy6qo35CcYvcjZT5o/98VaWU 9witF4rP/Py9pHpeqY5/YUR2+SoGjb/206fkS+D0niB9LLtkmBr+wTzI0ST1Nh1rvOH+ SBWo4m+SD+4Emwlo4Wgow8dAogLxqYamKTTB/JrZCclLotnY/njelVaRNbRT7MvEN2Oa Z55KVlbQKZNWo2M+/Lpf/r/g3TQn5oi+aBt22qL2UknekdGzOh9sXWuwTyvZ2wwUlYTN /HhA== X-Gm-Message-State: APjAAAXnCW6zpjI2E0e0yw6ctwISORh40IkGZoPCaw+Z8wcoiSJkompG decmZCGPUTX9wrRtd/9l7BWoLqK1Txs= X-Received: by 2002:a05:600c:2410:: with SMTP id 16mr2651853wmp.36.1574839325138; Tue, 26 Nov 2019 23:22:05 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id e16sm17983130wrj.80.2019.11.26.23.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:04 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.9 3/6] arm64: fix for bad_mode() handler to always result in panic Date: Wed, 27 Nov 2019 07:21:41 +0000 Message-Id: <20191127072144.30537-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127072144.30537-1-lee.jones@linaro.org> References: <20191127072144.30537-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hari Vyas [ Upstream commit e4ba15debcfd27f60d43da940a58108783bff2a6 ] The bad_mode() handler is called if we encounter an uunknown exception, with the expectation that the subsequent call to panic() will halt the system. Unfortunately, if the exception calling bad_mode() is taken from EL0, then the call to die() can end up killing the current user task and calling schedule() instead of falling through to panic(). Remove the die() call altogether, since we really want to bring down the machine in this "impossible" case. Signed-off-by: Hari Vyas Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Lee Jones --- arch/arm64/kernel/traps.c | 1 - 1 file changed, 1 deletion(-) -- 2.24.0 diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 28bef94cf792..5962badb3346 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -611,7 +611,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) handler[reason], smp_processor_id(), esr, esr_get_class_string(esr)); - die("Oops - bad mode", regs, 0); local_irq_disable(); panic("bad mode"); } From patchwork Wed Nov 27 07:21:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180256 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735636ilf; Tue, 26 Nov 2019 23:22:11 -0800 (PST) X-Google-Smtp-Source: APXvYqwhSUSZfMurnTFEphIlY6Wq+kkIV1sluAM8pspauIU1TKfIQfVaGX5LOb5Yp4cpCd7fmEpV X-Received: by 2002:a17:906:b6c3:: with SMTP id ec3mr48753743ejb.27.1574839331263; Tue, 26 Nov 2019 23:22:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839331; cv=none; d=google.com; s=arc-20160816; b=CxwRXhiz5u3VHjAq5bm0T+FCO+ypP9KicibpTSNnwubar73p51H92xI58u8RjT8zCm pZonfyRkDZPaoyPQSbV5gxuGtOrPbc3edhAaN4xsoILNae/hqzLPWe0leLtEw9rAz4vX xOGIjKfD6+KHWwtxRsD6WlOlJElq2fwJbch3rQc64ik4vcQzX+4QvsC7hZSl/v7ZEQ6G mk8N3LbVLAEa5U+II9lE5rvdGV68RIHk481cut0RDEYtguGXtlCMuvFfBVbS7te3a+wO CvCbYDjT5U+/xRSE7GqTAfvedSC6qmPMiYClnggpYlTZmM2qawBJ2Uo2krvk+JMVWsKG Pq0A== 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:to:from :dkim-signature; bh=PNM5lccoBtUfm9iFogx92X5PMCn4g3/BVdMdr/P978Y=; b=CbVDNqs5sLePo5UfdKrYPJqMDE7pnGgiCF/mF4q7QP06ptvLlI1YTaDteSK6ReN9ys fHaY95qpxRrjA1fYHNiR8+ebMEKl6ZmlvVwBTfSJjJve59xoO14FYAnpuz6+7tAA+7uS 6abEgi2eGU69ycNJwd+ca4x3VuuqHxva2dcLquHUbJQnvxs8NnrjL/yLCzgJi3W6yCKn Ya1Kgl0HklvpqhoBmIRCCo8gBjMbTHelzcDzk5JAsi7vmztsn4xUhLPPm4MCwe8tlPm+ jHmKl9hcKObBpBERQGVpK7JT7gFeFIjwqFBYrGt81kTfUaeFgnUQrQmKg8WadsYAhjEZ 5c6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YsChHgYg; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m19si69058ejc.66.2019.11.26.23.22.11; Tue, 26 Nov 2019 23:22:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YsChHgYg; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726478AbfK0HWK (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:10 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40620 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726373AbfK0HWK (ORCPT ); Wed, 27 Nov 2019 02:22:10 -0500 Received: by mail-wr1-f67.google.com with SMTP id c14so750732wrn.7 for ; Tue, 26 Nov 2019 23:22:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PNM5lccoBtUfm9iFogx92X5PMCn4g3/BVdMdr/P978Y=; b=YsChHgYggeUZO9x9e9+MAA/wLPYwxtb0tTDqUgr7RhlxiTZCy1wfvID4f0ZLOFFZel cx5N/hOLowxN/G8aa7qDfaEFMDayLwYP3QIxEGMAyDFmYXDvu5lEnO72YLs0yZbuVra+ xVVLqRIatINBrLPqBsjqxMCtdoakS7Ks9t3b/gH0pD3Ixn1IprUoR3VbV8qI9ApObG8c A+PuCnL8iU1w/YODr7JmsYJ+XPfHRli5u7SYp/mghJYaN/HptA35YdZ4XKCRTCZzZLGv CXBJ07Olkemq0kjMBAEemfiRvoteINGEW6dFGUnCbqlzUtf1ZFwVhuqBv020BJhYg54l LmUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PNM5lccoBtUfm9iFogx92X5PMCn4g3/BVdMdr/P978Y=; b=GJWq54cLyrGIhj1iy8aAlrFaj1eT73bPZUXGqNtgjyEhQ/UR6x1mpa4Bhkhl9VA93Q XCCjt0ZSJpBCpQdqwLD0Boew679oqUgFjn/MCxeANRtiMfRkkinCR6AX30HlsB2SzNSf mpqKXQYgfrkgya06jbm6ueqegSzAfZLxdkHsctrk6+X9cZgigiarAUiJ1AY+MdvOLbHO 9a0wisT6Bi7nCdBBIWcG3EoHbcjWBPxj9h0Ivn6DvIDQFNY0UdvVmk9ArXXbc7kv7TvZ uvUfdJrqCuk5u+XOtLjBS+x4ViB8kvePsHhBKEcupkMEzcfAK6sLCX5Eg9+iHaAWRNWp uCTg== X-Gm-Message-State: APjAAAUfJWtO9WL993m88CwowB/b0Pa8TfRFSfPYuyfEHwT1ZH2nTl2t JRXP1tUvqSTlg0FQLG4Hd7P+rPLFkB8= X-Received: by 2002:adf:b193:: with SMTP id q19mr40155798wra.78.1574839326144; Tue, 26 Nov 2019 23:22:06 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id e16sm17983130wrj.80.2019.11.26.23.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:05 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.9 4/6] cpufreq: Skip cpufreq resume if it's not suspended Date: Wed, 27 Nov 2019 07:21:42 +0000 Message-Id: <20191127072144.30537-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127072144.30537-1-lee.jones@linaro.org> References: <20191127072144.30537-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bo Yan [ Upstream commit 703cbaa601ff3fb554d1246c336ba727cc083ea0 ] cpufreq_resume can be called even without preceding cpufreq_suspend. This can happen in following scenario: suspend_devices_and_enter --> dpm_suspend_start --> dpm_prepare --> device_prepare : this function errors out --> dpm_suspend: this is skipped due to dpm_prepare failure this means cpufreq_suspend is skipped over --> goto Recover_platform, due to previous error --> goto Resume_devices --> dpm_resume_end --> dpm_resume --> cpufreq_resume In case schedutil is used as frequency governor, cpufreq_resume will eventually call sugov_start, which does following: memset(sg_cpu, 0, sizeof(*sg_cpu)); .... This effectively erases function pointer for frequency update, causing crash later on. The function pointer would have been set correctly if subsequent cpufreq_add_update_util_hook runs successfully, but that function returns earlier because cpufreq_suspend was not called: if (WARN_ON(per_cpu(cpufreq_update_util_data, cpu))) return; The fix is to check cpufreq_suspended first, if it's false, that means cpufreq_suspend was not called in the first place, so do not resume cpufreq. Signed-off-by: Bo Yan Acked-by: Viresh Kumar [ rjw: Dropped printing a message ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Lee Jones --- drivers/cpufreq/cpufreq.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.24.0 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index d43cd983a7ec..04101a6dc7f5 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1646,6 +1646,9 @@ void cpufreq_resume(void) if (!cpufreq_driver) return; + if (unlikely(!cpufreq_suspended)) + return; + cpufreq_suspended = false; if (!has_target() && !cpufreq_driver->resume) From patchwork Wed Nov 27 07:21:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180258 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735655ilf; Tue, 26 Nov 2019 23:22:12 -0800 (PST) X-Google-Smtp-Source: APXvYqy07WKp+6tEOx8wL45xnMZh5GAateWV1jZ53bmIU8BohO454ykO+NWk2VzmT05/EUql23r5 X-Received: by 2002:a17:906:52c3:: with SMTP id w3mr48816592ejn.122.1574839332656; Tue, 26 Nov 2019 23:22:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839332; cv=none; d=google.com; s=arc-20160816; b=S8x1hv+zktYVkvYnAwqL0v3IGs6lk0eolcdjNCwfMMMewTPBoXhsMvLlXjLYL9AGS3 Ahz950/37HA0ZrubkI6wkjkJciHtiGgditCYN0cKkwO/fr8TmzeSbTIVAJLZorQqkKil c3LP79RmdfCunXbkgbHPm9lpaa51Zyz2tYh763IpFm9uIZbOgQKyqzAt3L48mH6y8pA8 zs3S9GiF3607o5ZCbp7eA8+Uot37igoDjzfD8xm+QOo0fwIeBmIYXgZ3uWq5fqZrta7X ADofDHQPChMl8qXHGzYY1RC08r15inG2RmmzAzvDhMAkCEF+yVwYOPGhlalfbx5Jvvyc r8uQ== 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:to:from :dkim-signature; bh=EwOfwwiNckMuQzPVj8mAR4X16hKKAPeuk3yKLlec5YI=; b=upcJkE2IV9ZKrk2FHP0Juf7nIOpR3Z0L5NlBl67SQgPKTyr+lZF5LQ6CBqX3ZJDIrC l39GUGkIyC3xJK1xI8ksmZxs79s9A80Q9U8S5BccKMWqUXdB6bddehCjbhzFghmqs1tv NARQTl8/xcbwW9Kt/5++qUKkJV/M+ucarBnp/Me/nKPnYF39gVNn2l3RgFc4Veh7JQyM 5bfqdMytVCGgwg8hkwd+biIt6YstwRRznvqdt7OF42MzVfYeNFl+1peVgVbZEe5nX8we QSw2k2O6AFIowvQvLHpGcktBMYDuw4J7RXJu253OquAyNe8PwhOY5lUOOUM++AbcheBS kmkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V3I8YXvN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m19si69058ejc.66.2019.11.26.23.22.12; Tue, 26 Nov 2019 23:22:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V3I8YXvN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726383AbfK0HWM (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:12 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:35762 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726470AbfK0HWL (ORCPT ); Wed, 27 Nov 2019 02:22:11 -0500 Received: by mail-wr1-f65.google.com with SMTP id s5so25353732wrw.2 for ; Tue, 26 Nov 2019 23:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EwOfwwiNckMuQzPVj8mAR4X16hKKAPeuk3yKLlec5YI=; b=V3I8YXvNor+nCa7b1xHp+CvzeKniVPoGLykjf+XAcuJKfd9p9+fkdjScDkbTF3xYv/ QyEmkSOVx3fYUurIM1VUfgvHgX4GMMswAiGOGZkTj8fEuOwZjGAz/JDlYnFHLjZuWOHX duJFN8wQOzt9RxmmFgLnC0CO7QuYb2p6ORpI9u8oDK2BV6KU6p/iA+j9BAKFgnc//lxn 8hLTx0wclZCdf/XjqWvytwvojGUqjOLYvqNc21kHJ+9IvLV5w3s/kQGHe4BwSV2unXH5 URmFHvdKern3tvubdwEu4YjMcSTFaFJWsqVPQvCusDEjdO9pn6Mx1lk/QW7ofucp3KgP DABg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EwOfwwiNckMuQzPVj8mAR4X16hKKAPeuk3yKLlec5YI=; b=UZ2OBcGKMNCHTXNLpGsn7yCzNmTp02X9M/AWG/2XA3I1i8TXAeBSlHuCiAiBYbK7+I /h/bdqTTtDGolEp78M7KUVpbIFNy6V6HzMqjav10N67SMfN0w/xG94RoNuiGhmRgcCOP yYOa605EhWO+d8GjL99abSScDMrXIVpFlzLpbS/XqKKuDzQk5GnvzXrFYuDV+jAW5+vt BHHactcQ9/9F7ibGMxH5EFnjhW8FDxixIMwo2RvBvdd9WsnubaQFJl4d3foUB1/6DH6S KrnzN9ROQgU2vw/PRXvmndZchmMM//KDq8vBA4nCWH2Wicww0TmCplY2XSdSV9jfG3J2 3uAQ== X-Gm-Message-State: APjAAAUwSKvl/EVU4P+h5UNS1jPIVxEfr3tTZE2DOKfodQIa0snybeOS CaTROLrPcMakd2cjn7ePB1QGcyTm5+I= X-Received: by 2002:adf:e40e:: with SMTP id g14mr19450781wrm.264.1574839327516; Tue, 26 Nov 2019 23:22:07 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id e16sm17983130wrj.80.2019.11.26.23.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:07 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.9 5/6] dm: use blk_set_queue_dying() in __dm_destroy() Date: Wed, 27 Nov 2019 07:21:43 +0000 Message-Id: <20191127072144.30537-5-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127072144.30537-1-lee.jones@linaro.org> References: <20191127072144.30537-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bart Van Assche [ Upstream commit 2e91c3694181dc500faffec16c5aaa0ac5e15449 ] After QUEUE_FLAG_DYING has been set any code that is waiting in get_request() should be woken up. But to get this behaviour blk_set_queue_dying() must be used instead of only setting QUEUE_FLAG_DYING. Signed-off-by: Bart Van Assche Signed-off-by: Mike Snitzer Signed-off-by: Lee Jones --- drivers/md/dm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.24.0 diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 2ffe7db75acb..36e6221fabab 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1946,9 +1946,7 @@ static void __dm_destroy(struct mapped_device *md, bool wait) set_bit(DMF_FREEING, &md->flags); spin_unlock(&_minor_lock); - spin_lock_irq(q->queue_lock); - queue_flag_set(QUEUE_FLAG_DYING, q); - spin_unlock_irq(q->queue_lock); + blk_set_queue_dying(q); if (dm_request_based(md) && md->kworker_task) kthread_flush_worker(&md->kworker); From patchwork Wed Nov 27 07:21:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180257 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735650ilf; Tue, 26 Nov 2019 23:22:12 -0800 (PST) X-Google-Smtp-Source: APXvYqwNnylWRFvxlmXYCrWHpvK2GUJ6Uby482HamG8BfABiK9AnchBhoogcbZlqI2MQlACMBn4r X-Received: by 2002:a50:f699:: with SMTP id d25mr29555184edn.72.1574839332253; Tue, 26 Nov 2019 23:22:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839332; cv=none; d=google.com; s=arc-20160816; b=GoGXsGaWKvfV3Nn5C9KJ5NzGjKQfybAZb3rYZ9sRfHRtXqOx/FtxqidFKEwc6JFyF1 rRR96Ufmc622LqwvXFP5RRNXBQtGuxaJK1ELlbqzXpHdBM/hbb5CDkSpsVkU+drpaWtq zF5suOqCUW5lzyiqTmwGw3cxIc2t3IQSDdNq1sBahsSx+HFJ0gnDaXtLFfuyVPO8Bw66 TLILVj13WJ3UFxmd95SCyChYSMQmypZiePZufC2eecEaPLt3FXaJsFLVSQR0Ftyoe1Ra y7v9adTzy7tCDYyyl0QuRSmvNS6fqZenxeaZe+UMBsNnt6oFk+xFPeLyNiPIgZwjTxkR XLWg== 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:to:from :dkim-signature; bh=c1Oau3Pvqb3kiOGOU8Ip4efQlbsCGfoIa++MtluImhk=; b=yxzW6Ip7ZGMFjPnhLn+cDmLW9Rqmv/X+qMdKaJqZaUyVZOm7fLOxklL61yBBqUw63s T7rHCLrXuLjIs3l4+uFf5G+fI77KNu/TdGSKVYoKuwTprRt0Z3EEBrveL2GZy1e58XOE 9kwEPDgGOAT+EP5yJAureW6uQqd24sb+sSaWi2CFvPfwEZAbWp+YMYkmOBifOqTnePKB zgmSGpuOZVOJjUw4KITWS2bCjX0xcC0dR5hw9msKKCi1AcwJxM8QF6W38+Yke5zWj477 lunRh8HSaa1/ZBE80r0UTBb2O35Xt8JJ46Bx74JpibDw10ByPKP3tZgIYsbsbE7s6hsx 3f9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LflgAXI6; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m19si69058ejc.66.2019.11.26.23.22.11; Tue, 26 Nov 2019 23:22:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LflgAXI6; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726373AbfK0HWL (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:11 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:34441 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726383AbfK0HWK (ORCPT ); Wed, 27 Nov 2019 02:22:10 -0500 Received: by mail-wr1-f68.google.com with SMTP id t2so25377137wrr.1 for ; Tue, 26 Nov 2019 23:22:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=c1Oau3Pvqb3kiOGOU8Ip4efQlbsCGfoIa++MtluImhk=; b=LflgAXI6UuG+j1OC4PPlqDG0tprhsdAb1bpuvwpw2e/uEYAcVLpKPpU6rW2ze+A102 ZS1KkNlRGNv0DLuterYUoVi1IX+uZxDKgn1XozkIQd0L4e+EQ59gGHHyXgZtkYk8ZCpz yPIXNDCXOngB1pT6SP747RfaCOUCays0JN/kCgSSTtdr/mfo6tkm5GSDltaZ81N3EGg5 AVW+umHGBljQwQqYATmMPUEMCTHHJqSotjLJMd/BJ0t0Uh8vUdAn0Ghyt710oUm4SqRK zhPEXtp2XcA07GoHAG2H1VI2QkNhflxF4vaITOqBk5H9IzZxFoTdP6KZsI9HvMEihoY5 bZEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c1Oau3Pvqb3kiOGOU8Ip4efQlbsCGfoIa++MtluImhk=; b=CfdMpwwpQAkyMI16oo4pmoFS1+YlUzuFcBvbnuQ8g+8ZTgSkD2PL7z+9oEfL9bpC4b 3OZCdGJwYkAecrvZBg6urZEwNWMlfi28ZyIYOoqP72IlrM3uaDx9lCIS8L1mibgI6fSJ Myx4nvRWWg7OJRW9yE2AXy/0ByIBz21fZAskM9S+Lh7I9rRfl+99nzp4InJwMrG5JCia KTEmKJTSwsqPUbcbECfhTxO+dQ71/fwFdCC45BtCv3e/qZYvrO42E8S//aw470P5vphR lQ/kOHHI3CYqfh9VgNw0hhGBsnpO6GgBoEPOlmD5UbaiX8HmZFJJrRFWEORdmH9sgzSy OLBw== X-Gm-Message-State: APjAAAUyLYHvD2FKXRRpfsiGf5g7bDyrYcIiFKraXB0W0TThFnDRoGDd e34ayUlXVnF2zjSuL/RK+jffCqglESI= X-Received: by 2002:adf:f103:: with SMTP id r3mr4582018wro.295.1574839328131; Tue, 26 Nov 2019 23:22:08 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id e16sm17983130wrj.80.2019.11.26.23.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:07 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.9 6/6] ocfs2: remove ocfs2_is_o2cb_active() Date: Wed, 27 Nov 2019 07:21:44 +0000 Message-Id: <20191127072144.30537-6-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127072144.30537-1-lee.jones@linaro.org> References: <20191127072144.30537-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gang He [ Upstream commit a634644751c46238df58bbfe992e30c1668388db ] Remove ocfs2_is_o2cb_active(). We have similar functions to identify which cluster stack is being used via osb->osb_cluster_stack. Secondly, the current implementation of ocfs2_is_o2cb_active() is not totally safe. Based on the design of stackglue, we need to get ocfs2_stack_lock before using ocfs2_stack related data structures, and that active_stack pointer can be NULL in the case of mount failure. Link: http://lkml.kernel.org/r/1495441079-11708-1-git-send-email-ghe@suse.com Signed-off-by: Gang He Reviewed-by: Joseph Qi Reviewed-by: Eric Ren Acked-by: Changwei Ge Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Lee Jones --- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stackglue.c | 6 ------ fs/ocfs2/stackglue.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) -- 2.24.0 diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 5729d55da67d..2c3e975126b3 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -3421,7 +3421,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb, * we can recover correctly from node failure. Otherwise, we may get * invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set. */ - if (!ocfs2_is_o2cb_active() && + if (ocfs2_userspace_stack(osb) && lockres->l_ops->flags & LOCK_TYPE_USES_LVB) lvb = 1; diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index 820359096c7a..52c07346bea3 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c @@ -48,12 +48,6 @@ static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl"; */ static struct ocfs2_stack_plugin *active_stack; -inline int ocfs2_is_o2cb_active(void) -{ - return !strcmp(active_stack->sp_name, OCFS2_STACK_PLUGIN_O2CB); -} -EXPORT_SYMBOL_GPL(ocfs2_is_o2cb_active); - static struct ocfs2_stack_plugin *ocfs2_stack_lookup(const char *name) { struct ocfs2_stack_plugin *p; diff --git a/fs/ocfs2/stackglue.h b/fs/ocfs2/stackglue.h index e3036e1790e8..f2dce10fae54 100644 --- a/fs/ocfs2/stackglue.h +++ b/fs/ocfs2/stackglue.h @@ -298,9 +298,6 @@ void ocfs2_stack_glue_set_max_proto_version(struct ocfs2_protocol_version *max_p int ocfs2_stack_glue_register(struct ocfs2_stack_plugin *plugin); void ocfs2_stack_glue_unregister(struct ocfs2_stack_plugin *plugin); -/* In ocfs2_downconvert_lock(), we need to know which stack we are using */ -int ocfs2_is_o2cb_active(void); - extern struct kset *ocfs2_kset; #endif /* STACKGLUE_H */