From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7893AC4332F for ; Fri, 3 Nov 2023 00:57:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B36798D00B0; Thu, 2 Nov 2023 20:57:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE72D8D000F; Thu, 2 Nov 2023 20:57:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D61A8D00B0; Thu, 2 Nov 2023 20:57:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8E9448D000F for ; Thu, 2 Nov 2023 20:57:21 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6C4E81CBDCE for ; Fri, 3 Nov 2023 00:57:21 +0000 (UTC) X-FDA: 81414829482.18.795CDB9 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf16.hostedemail.com (Postfix) with ESMTP id CAD90180008 for ; Fri, 3 Nov 2023 00:57:17 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=none; spf=none (imf16.hostedemail.com: domain of riel@shelob.surriel.com has no SPF policy when checking 96.67.55.147) smtp.mailfrom=riel@shelob.surriel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698973039; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HatN580BRM16zFEeT44/lOWyRWNacTZuXSlGxBveIi0=; b=WFge4WNqvKQJt215jf8jJD4WHCmvD0x/LM7MhyLNLH/DTadvTDc5KI70rKYAjexv923grT 8Lh+dby1/84tRS/WxgF2SnUek72lYpQbZSwFFoaqS6ElxmiDyvvE8vq9WOULzfGLj8TDvd LzvhscHWPtqmRSSY97RCoQ+lals76Co= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=none; spf=none (imf16.hostedemail.com: domain of riel@shelob.surriel.com has no SPF policy when checking 96.67.55.147) smtp.mailfrom=riel@shelob.surriel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698973039; a=rsa-sha256; cv=none; b=L2Qo6mH9pejtPpKlvEWIo6k1CbO0w6nOkVknQC4BiByfv5o9TQTg6PyKX0SGVdayohYkOd fKBHl1L+Yeg6pM1+9OHEZ4puXnwYl17yDg8OlXYAnmSvno9NXDKrAPY5danYIGKMya+ncj SGkikZ5RHx33+dVwXc53Hsh/Rhk3G8o= Received: from imladris.home.surriel.com ([10.0.13.28] helo=imladris.surriel.com) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1qyiUR-0006V8-14; Thu, 02 Nov 2023 20:56:47 -0400 Message-ID: <32cb089b2afec5dc3bb96234753cca4b22cb9ccd.camel@surriel.com> Subject: Re: [PATCH] mm/hugetlb: fix null ptr defer in hugetlb_vma_lock_write From: Rik van Riel To: Edward Adam Davis Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, mike.kravetz@oracle.com, muchun.song@linux.dev, nathan@kernel.org, ndesaulniers@google.com, syzbot+6ada951e7c0f7bc8a71e@syzkaller.appspotmail.com, syzkaller-bugs@googlegroups.com, trix@redhat.com Date: Thu, 02 Nov 2023 20:56:47 -0400 In-Reply-To: References: <3382634358afa9b95dc4f6db8a53a136d4b9e9cb.camel@surriel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 (3.46.4-1.fc37) MIME-Version: 1.0 X-Rspamd-Queue-Id: CAD90180008 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: eecna3ki5qbg4un8zhh5r6g6gwcc5445 X-HE-Tag: 1698973037-759632 X-HE-Meta: U2FsdGVkX199WA23zPS9VKDtoEHiZGF52Ctt+tJ6JTbQpNwHj3mrhCvArW6A+lTLNbLb/7kysVLV5NkabNUod7TxXW+jBQln8LgKiSdn7dtzukSN1DlTwY492sv7VX4GPRdNFU+9+q6JaXnhO342MTRBjCpyRWAjQfW0w+JDwG9oNneAYt2tUV71bQiOpUl29zfy+1fkUvp0kN7+XK9SkcotWzndsMYFC5Mllz/CvjG2RsVdOcVOLFpYdQn1IRkg3japG4A4okThc5VBZoEzBz8euD+VfLIt0w2wNpDVi25zy8e2PQYtPefn+6Hsb62gh7JPksJh+3Uv5lddXy1shFcgr9EJMdriivVHiW7B/2giREFSyy8Rz/+oguerw2eILrFJdXA4IAWxKu1M6/15joXBSHyJKfnRlLBDMxL34Nx0nQQnLIh8lkXYO5fdxmB8mSwUkMsdbsWVrZIJTeLOZ0v/jAjamu0RpRYxhlGfRN/GGZPszH91wbb6Mjyjbr/jLwRG6mKh7+taUAX2N3UgrOo6HP/9QtHOB1VzxgMOsySECrJQmnHRy4y3Gx6JzkTWaocgbrDVyQOFrDKoL9QF+LFOWz2qpZoVe0SrTLdqG9dnJ0FC01hNiXW+dUXGn+al71Z23w5RvEuRTWX+pRg3jxd2Y0BYuasCNGTTXHfNePSpWmBDGd3tqJZ8dgNzqbA79we8pf7dD9PC3EN4eu3nMPObVLAySaTeVGXuAyzA4FgSHzDWJuvX0gbNRjwF16NM5eRclK87eJUICMIDn88oXVHujygdkMgcpTSUcPL6FD2OOy22KVCfv66UivCYEt4rf+/n165C3XPWtLGPF4q0rJd6UBFl2wdIFP0z0RmV1JGdrZAnyevD1aWYcfm35PJqk5l4jEZT8qdn96P+Km2DS0nZVjSc6dMMfEBOAYHZFBxY15qTjZz7YBg+JieqCQzbABvsl5qvoRritjVZtl5 OyAFebGO Z6fpZG7ZlsHq/d6vW3rJpPrTubzLQ3ojSuMMKXH0OZ1knUCuqhRh7GXepbWMlQepmo4A3/IVMG+TojmmqpAStPyMb/YwTUjtk5NPxmsEbQZYpfC6ZsyY+FiHDsrRmkkbhh6JmEKzX4x5fr0cP9ylC9AFokv3abxc0hPc6Leqo6qzDDmZj0MqAAfdkiCDZuZECUthQ8B5uR2flcDvKpcJ01TKEbYprOArUdNjHm/PFMQwc0Y8giQ5dfQQ8LFRmjLROr/gG6eqdYR90rICVYqTM3yhQzDMr9BIz5LWkqwH/KqlTTc2nn/hLHOAEfYxQW2ZzzM5h9X2mn/DED3Db1fKAVpVFAcl+JjnVwPE+PsDEG6TwGmIs7zmtJCPiW7oRLTrPCMzq/+xm22hi1Zc= 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: List-Subscribe: List-Unsubscribe: On Thu, 2023-11-02 at 20:58 +0800, Edward Adam Davis wrote: >=20 > +++ b/include/linux/hugetlb.h >=20 > +#define HPAGE_RESV_OWNER=C2=A0=C2=A0=C2=A0 (1UL << 0) > =C2=A0static inline bool __vma_private_lock(struct vm_area_struct *vma) > =C2=A0{ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return (!(vma->vm_flags & VM_M= AYSHARE)) && vma- > >vm_private_data; > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return (!(vma->vm_flags & VM_M= AYSHARE)) && vma- > >vm_private_data &&=20 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0is_vma_resv_set(vma, HPAGE_RESV_OWNER); > =C2=A0} > =C2=A0 > =C2=A0/* > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 1301ba7b2c9a..97ea782dfba6 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1033,7 +1033,6 @@ __weak unsigned long vma_mmu_pagesize(struct > vm_area_struct *vma) > =C2=A0 * bits of the reservation map pointer, which are always clear due > to > =C2=A0 * alignment. > =C2=A0 */ > -#define HPAGE_RESV_OWNER=C2=A0=C2=A0=C2=A0 (1UL << 0) > =C2=A0#define HPAGE_RESV_UNMAPPED (1UL << 1) > =C2=A0#define HPAGE_RESV_MASK (HPAGE_RESV_OWNER | HPAGE_RESV_UNMAPPED) > =C2=A0 Moving just that one define is less than ideal, and the kernel test robot seems unhappy, too. It may be cleaner to just move __vma_private_lock into hugetlb.c, where it has all the dependencies it needs. It isn't being called from anywhere else, anyway. Hopefully that will keep the kernel test robot happy, too :) --=20 All Rights Reversed.