From patchwork Fri May 25 20:16:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rientjes X-Patchwork-Id: 10428427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B6FF601D5 for ; Fri, 25 May 2018 20:16:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B515297D8 for ; Fri, 25 May 2018 20:16:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C3E3297DB; Fri, 25 May 2018 20:16:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C53A4297D8 for ; Fri, 25 May 2018 20:16:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F9986B0003; Fri, 25 May 2018 16:16:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 680466B0006; Fri, 25 May 2018 16:16:49 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5236E6B0007; Fri, 25 May 2018 16:16:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id 0BD136B0003 for ; Fri, 25 May 2018 16:16:49 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id b25-v6so3498817pfn.10 for ; Fri, 25 May 2018 13:16:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:from:to:cc:subject :message-id:user-agent:mime-version; bh=5JB8LLvqSezirheBin7AHndg6MrbuBlnTtV/kRZPAO0=; b=tw+XfxpJ2oqcxmJPlDkHdqSvBp9cZIdoAKd5G8sKW/idgAoeWkcB1kdPqKuPaTQCv1 mPMmZYwPd9Beuf413C1ksnRphRwsFfUn8eBnd6xT5x2PPD9E1Ui6yzOTmuVusyAFyCn/ XB+5VF+d2K0rPrHOnrZ6xccaDD5LLQ+R559pVdLlUSLwIkhrSNAYKlVWlBO+0gOwJHdo XIRiBAjqtN2iECsoHV8lbOv0jdXbYmQmY10bIi1EdPQWqbUKWvKeAGzevG10HBNT+6AU 7i27ZSkZfc2pW/mkzwP99NCmJatZLX8qEd2M/Ww8tKkB7VZ5OM54a0FHqUEzSlYKAhGy kfpQ== X-Gm-Message-State: ALKqPwcOGn94XAHVALCrEa8nUcXSbY7xMbvZmwsRaFsFNGVrvUY1RviX /qxwPkCeCVcqkUxHO7aoidRWGw3pnauWOf3uHHcKT8UOxQ0MyIhALUHAKEgtQ0210Se9QSGjXsL ymZ9o8KTvCRCU5iNChJqaRYHAaQAqkD+qoQQikGo0rfweEW+1/fgKHsjJeL9bSn/bMWks/3gJOj 7EEyTnSmRZ5/R2+HSm2+1TH02IHm3RPd/WNh1yt3v3AFfFGJ4yBizcxcjdpHMGQPT3Cw79MNEyH /4VqMfMVJ3B86Qt64m3lCCKEd+CDjkg9BvAwz7Ot9fHj7qWZLv0kDggfVBqKMFlPf7Nv14ROQtH iIApKP4EOFCIIWqIVPsiWLvsFx5gZ+HGbRx84UQn8646/zIrUszl33eq+/8QeBhtfrcmcQo6tgb U X-Received: by 2002:a62:c205:: with SMTP id l5-v6mr3974772pfg.6.1527279408710; Fri, 25 May 2018 13:16:48 -0700 (PDT) X-Received: by 2002:a62:c205:: with SMTP id l5-v6mr3974719pfg.6.1527279407723; Fri, 25 May 2018 13:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527279407; cv=none; d=google.com; s=arc-20160816; b=0AEFZ92MPtxprd4V2yy/AqMQSebdeWygvh8HNb8NizH/Xwsy8cPFLGy8KY9PKCfokM xI8sBzVrbApHC7XzCjzbYWtQUzaypPs4Z/ynXJn9Jfa6pKJjjjoKj+raMje2LjMVSBzX jSTECzRoej1tk47cfozB/yGO/Q1imEJ+KJAk4w4Ug8HGecebbZ9x4ruJQlvHTiLh4M3p RqDJkSntBHG4bBEq9r6ScjVIUl8P1j+hW2uc50s8Fje5e0cZQpDscb6mc72pyIrsjyKh x9JgchXJK2k9yyIzfB4jX+3nn+MsNohrLRV+LVMmEl0z1467pIqA1ZQZ8CKp3UmrpDVw WGiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:message-id:subject:cc:to:from:date :dkim-signature:arc-authentication-results; bh=5JB8LLvqSezirheBin7AHndg6MrbuBlnTtV/kRZPAO0=; b=iB9YA/FK4yMZErefzgmm9M+y/JbShOheJR9ZsD2t03CSEPiNh7lQT5/0sD5LKclib6 kk1qCgdgOuoSBV9Ivt2gTUE7fBDgM6ZMr2GQxIFjVH/unJrLVlv/WS8Bv2GH01zyhPWK qA2Im0r9NDnh2poBYmBOdcIkz3yV/I9hMvWUFmtnkBvmKPIWcbG3sa3hH10AKYsnUNnY /GF0DAqnVSoLXtKvuw78o/03JurpVewmF2mmQQYQxPgnW4XWPtwHAvr5UlF7/2LkC48B VQDn7odL0xLVCo3x0EkWbiMFzVgNT/A0hqYr5p7riBWE1VP9htbP5szJt8tzeFPEKubR T5uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=AZB7dPxx; spf=pass (google.com: domain of rientjes@google.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=rientjes@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id x14-v6sor7025020pgq.277.2018.05.25.13.16.47 for (Google Transport Security); Fri, 25 May 2018 13:16:47 -0700 (PDT) Received-SPF: pass (google.com: domain of rientjes@google.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=AZB7dPxx; spf=pass (google.com: domain of rientjes@google.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=rientjes@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:user-agent:mime-version; bh=5JB8LLvqSezirheBin7AHndg6MrbuBlnTtV/kRZPAO0=; b=AZB7dPxxO1nUYowCvEmr4e47DSAlPI1HjOJhKjLcdOTcA91SKWxTGBYR/helvbCvWv LMyIXncDIOacIljuwdU2XJkasoisGMT9oJcbIvpfo2Kb3x6dwfpZKMsCuTISWmCv0JoZ DQrK2JJuhMq6Kd8x1xNEeHo1SfTjYBsBCjjhSl267SNnCWd6OjreJZutFDq9CKwK6oa0 /+v/5f3BMN7C+lAi9BvBQZ8SY025VNV+T4l4dBb49SMwH5QD/8C3wNWEj9Vq+vZqKTJK 3Dwudu23VkmWr0L0oWlGE51TcUauHns4LLZ21QbztCbJ/IyV9YlGDbhBSbJk7R2PkbX0 cGhA== X-Google-Smtp-Source: AB8JxZrkwSz8GAv9nwNTVtuSWiNMcze/SABymRwWnN8f+VHDh0wg2+LWOdH1n/ebkL9Vv/jGq2cuUw== X-Received: by 2002:a63:69c3:: with SMTP id e186-v6mr3087448pgc.353.1527279407082; Fri, 25 May 2018 13:16:47 -0700 (PDT) Received: from [2620:15c:17:3:3a5:23a7:5e32:4598] ([2620:15c:17:3:3a5:23a7:5e32:4598]) by smtp.gmail.com with ESMTPSA id v16-v6sm76876940pfk.164.2018.05.25.13.16.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 May 2018 13:16:46 -0700 (PDT) Date: Fri, 25 May 2018 13:16:45 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Andrew Morton cc: Mike Kravetz , "Aneesh Kumar K.V" , Naoya Horiguchi , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [patch] mm, hugetlb_cgroup: suppress SIGBUS when hugetlb_cgroup charge fails Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP When charging to a hugetlb_cgroup fails, alloc_huge_page() returns ERR_PTR(-ENOSPC) which will cause VM_FAULT_SIGBUS to be returned to the page fault handler. Instead, return the proper error code, ERR_PTR(-ENOMEM), so VM_FAULT_OOM is handled correctly. This is consistent with failing mem cgroup charges in the non-hugetlb fault path. At the same time, restructure the return paths of alloc_huge_page() so it is consistent. Signed-off-by: David Rientjes --- mm/hugetlb.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2006,8 +2006,10 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, * code of zero indicates a reservation exists (no change). */ map_chg = gbl_chg = vma_needs_reservation(h, vma, addr); - if (map_chg < 0) - return ERR_PTR(-ENOMEM); + if (map_chg < 0) { + ret = -ENOMEM; + goto out; + } /* * Processes that did not create the mapping will have no @@ -2019,8 +2021,8 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, if (map_chg || avoid_reserve) { gbl_chg = hugepage_subpool_get_pages(spool, 1); if (gbl_chg < 0) { - vma_end_reservation(h, vma, addr); - return ERR_PTR(-ENOSPC); + ret = -ENOSPC; + goto out_reservation; } /* @@ -2049,8 +2051,10 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, if (!page) { spin_unlock(&hugetlb_lock); page = alloc_buddy_huge_page_with_mpol(h, vma, addr); - if (!page) + if (!page) { + ret = -ENOSPC; goto out_uncharge_cgroup; + } if (!avoid_reserve && vma_has_reserves(vma, gbl_chg)) { SetPagePrivate(page); h->resv_huge_pages--; @@ -2087,8 +2091,10 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, out_subpool_put: if (map_chg || avoid_reserve) hugepage_subpool_put_pages(spool, 1); +out_reservation: vma_end_reservation(h, vma, addr); - return ERR_PTR(-ENOSPC); +out: + return ERR_PTR(ret); } int alloc_bootmem_huge_page(struct hstate *h)