From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226OwGMlK8jIVbPsQI8Uva+K0DUnCDI5oVtSJaXUoFQQrHYXbVOCtF3YZ9Bjg0RsORugRG5A ARC-Seal: i=1; a=rsa-sha256; t=1519412236; cv=none; d=google.com; s=arc-20160816; b=ssrKvd1727MaV0LYVm1CXU9XNy8QMF/8fhV1VZalJ3Xet/DcDLJM20MDlrsFrQ1qLU /Zx5pwyqYMcR8cYxPVu9NwTd2YiG0dAO5PMV6+8WUjN66ffoUGtl9Yok59FCT1MrXXPI gNmLarjfKyQKCnxE64vZNDdlC2eCoEBNpAXhnRMwmW/5RnQNgwP+huFhFUe1EmepwoaO Ga9yTdm08cYlEd1+G6citG1Yb6j0mzwSirEKmGHDAJDsjmanZqNa2sM69ajRHlRp1D9v kcts8rfE0zp9UG1EkGz+rrckYsW4vPHk7sT4xVp9KiWEnfiUVSfHymMvJwjCm7ybnipO QQ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=zuy9QVyX8vPdAhJy6Uo9sytiAp6A4ew+0J7/uNl7Zio=; b=wK6IjkL3uX3Bgc9q0ciTcI9wKe/9+lUoaG1vtAvihLkj+AQ0KAM1jKyb5TSqahOzvc vNiIsmPD+CxSU3DzcPBIYDwbvO8h5y7yCAxK1QCzBIfoU41pHrWIn3cs0t7X/Tmtv732 LPcF+o712fgWutUM/j5nxXQTZUGZRDRtsIpCgUG3X/hS9RERh2PUs2hy76qoxO32VD28 IfedB/lAYHOpHzgpibbWqY13tcTXF7sKbO0AFHvQbLbkHHeituVL+JEUZ1TB20nAjMlX NmYJIC/G+inBW3Mobnx2xEtfY9Ug3FdCJ3IPEIEzxsAYutCYhz8+mmDLazXShFIh6r7X +MfA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Hocko , Kai Heng Feng , Matthew Wilcox , Laura Abbott , Andrew Morton , Linus Torvalds Subject: [PATCH 4.14 159/159] vmalloc: fix __GFP_HIGHMEM usage for vmalloc_32 on 32b systems Date: Fri, 23 Feb 2018 19:27:47 +0100 Message-Id: <20180223170802.206405179@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1593219205208783102?= X-GMAIL-MSGID: =?utf-8?q?1593219205208783102?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Hocko commit 698d0831ba87b92ae10b15e8203cfd59f5a59a35 upstream. Kai Heng Feng has noticed that BUG_ON(PageHighMem(pg)) triggers in drivers/media/common/saa7146/saa7146_core.c since 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly"). saa7146_vmalloc_build_pgtable uses vmalloc_32 and it is reasonable to expect that the resulting page is not in highmem. The above commit aimed to add __GFP_HIGHMEM only for those requests which do not specify any zone modifier gfp flag. vmalloc_32 relies on GFP_VMALLOC32 which should do the right thing. Except it has been missed that GFP_VMALLOC32 is an alias for GFP_KERNEL on 32b architectures. Thanks to Matthew to notice this. Fix the problem by unconditionally setting GFP_DMA32 in GFP_VMALLOC32 for !64b arches (as a bailout). This should do the right thing and use ZONE_NORMAL which should be always below 4G on 32b systems. Debugged by Matthew Wilcox. [akpm@linux-foundation.org: coding-style fixes] Link: http://lkml.kernel.org/r/20180212095019.GX21609@dhcp22.suse.cz Fixes: 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly”) Signed-off-by: Michal Hocko Reported-by: Kai Heng Feng Cc: Matthew Wilcox Cc: Laura Abbott Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/vmalloc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1943,11 +1943,15 @@ void *vmalloc_exec(unsigned long size) } #if defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA32) -#define GFP_VMALLOC32 GFP_DMA32 | GFP_KERNEL +#define GFP_VMALLOC32 (GFP_DMA32 | GFP_KERNEL) #elif defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA) -#define GFP_VMALLOC32 GFP_DMA | GFP_KERNEL +#define GFP_VMALLOC32 (GFP_DMA | GFP_KERNEL) #else -#define GFP_VMALLOC32 GFP_KERNEL +/* + * 64b systems should always have either DMA or DMA32 zones. For others + * GFP_DMA32 should do the right thing and use the normal zone. + */ +#define GFP_VMALLOC32 GFP_DMA32 | GFP_KERNEL #endif /**