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 B70FDC761A6 for ; Tue, 28 Mar 2023 11:56:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D605900002; Tue, 28 Mar 2023 07:56:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 286326B0075; Tue, 28 Mar 2023 07:56:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1272C900002; Tue, 28 Mar 2023 07:56:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0516C6B0074 for ; Tue, 28 Mar 2023 07:56:18 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D45591409A0 for ; Tue, 28 Mar 2023 11:56:17 +0000 (UTC) X-FDA: 80618153994.26.261249F Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) by imf29.hostedemail.com (Postfix) with ESMTP id 22B5412000B for ; Tue, 28 Mar 2023 11:56:15 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hoLgsOkZ; spf=pass (imf29.hostedemail.com: domain of elver@google.com designates 209.85.219.182 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680004576; h=from:from: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nc5W1lE9EjIhY3BF/8rAhRpdJPCQCh8hr/U0i6aHjsc=; b=FNxnwXPtX4t6CzfGxDtPyD21deEL42yXif5Z5TY7kT3E+2A9jCpPq1vY89OENljhaoF2aj OE4Onpj2NB/vLgCiXC3GtOCv8PCx1Tpq+sJVI4LAzp8qo6Ry3PHO1tGnSUf6UW/MA5P71f dIH2oOaXMcNQQZLh4xKQr8onNGawK9o= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hoLgsOkZ; spf=pass (imf29.hostedemail.com: domain of elver@google.com designates 209.85.219.182 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680004576; a=rsa-sha256; cv=none; b=1USdomAFC+Y4OU7kzGV3Whyx4e6mI1oPELY0MOAw77EnRGdmpRcD3M/yuoE+holEvAFDJ0 wwyJfcwbIHdoLiFTKXh4W15i50YkAWAnirf9rq9ytRItMoqoQiGwO7KHNgcGdD5aV53Wy3 ooeWrdjV/rffDs27kznECrqKcvjPQXo= Received: by mail-yb1-f182.google.com with SMTP id p203so14612329ybb.13 for ; Tue, 28 Mar 2023 04:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680004575; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=nc5W1lE9EjIhY3BF/8rAhRpdJPCQCh8hr/U0i6aHjsc=; b=hoLgsOkZ2x2vUsVYvB5E+SmxoYqNebP0ycxMynfyPa6K7RVfCwIH7l21ZbSc0/ESLu mY9snWPalWGPggsJ3pd7YwOuIDkDupgeBzOXX0WANs8Kp1rRK5FB//hyL2uAehTGM5To DspGUnxugzBT/BUr7IvG1rva6aQ3BGSKy/Medpctq8CC434cWDCNnJtm+d2uEVmPFmlv NtYmK9+np/DOgURzp9tj0W+BdfZEwjgX4kAj2eAPR6GOKRycla+g8eeV/Y998rSrwyu4 DEL9Pf1/7lGBYxUWwEsz6Wd4wYS2TjUgqolw1pkX/1GqLzCB34tTLQlJqZfE7WWYvgJ/ 2Xzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680004575; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nc5W1lE9EjIhY3BF/8rAhRpdJPCQCh8hr/U0i6aHjsc=; b=ar5h7z879oYgkBSqE3zxQS362dAc6VPHW3WKGNtBxSQWMrf+AN/B9I/iYltAQsHJ+Z qnu7Fidpk/zL7tV6ujzMTbiMe1QVVsmivrEzzDTSP5AWbckpipZHV8G3AFg8JKWwBnW3 JOz6jb1C7zb/FjmVFdSbZeMJOa4AfPyyKzmElLvkNWAIg4NzEGXI6dmJDKbh+SvVPMIQ 2PopGUNfL6exxnoTtiPmkBuXA9eUaQVZgQeBTqP1aNfeVXwzMMO6bnOmcLb0LU89NhaX ssknv493WbXcOQXsGRWJK/H9SGsyKqGaTpFQ8O0OS4sUabRXSjwRhdTAXikp6LjEfCDC idkA== X-Gm-Message-State: AAQBX9f850eMYq1R4hBGaDVIe3cvKsT8bo/gAnkqE13Zp1yAJ/TrlPZH GmS6OtfTU7koMu2CachsU7Q+L37O64S5qJtIL9+LFw== X-Google-Smtp-Source: AKy350YP6oV53+191HmhMOuB0nH+1b8IUYvwyKlcGo3d6EZ2MKveajdpBVN3VzunfqGw/L3jRxjgEIF2nHHslh/iN3Y= X-Received: by 2002:a25:ab81:0:b0:b65:89bd:3c85 with SMTP id v1-20020a25ab81000000b00b6589bd3c85mr15082098ybi.4.1680004575191; Tue, 28 Mar 2023 04:56:15 -0700 (PDT) MIME-Version: 1.0 References: <20230328095807.7014-1-songmuchun@bytedance.com> <20230328095807.7014-7-songmuchun@bytedance.com> In-Reply-To: <20230328095807.7014-7-songmuchun@bytedance.com> From: Marco Elver Date: Tue, 28 Mar 2023 13:55:38 +0200 Message-ID: Subject: Re: [PATCH 6/6] mm: kfence: replace ALIGN_DOWN(x, PAGE_SIZE) with PAGE_ALIGN_DOWN(x) To: Muchun Song Cc: glider@google.com, dvyukov@google.com, akpm@linux-foundation.org, jannh@google.com, sjpark@amazon.de, muchun.song@linux.dev, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 22B5412000B X-Rspam-User: X-Stat-Signature: s8mmg7o41wg3i5u95rpisxze8fzssxmu X-HE-Tag: 1680004575-257348 X-HE-Meta: U2FsdGVkX18IDX9pe7GCxBF1bsp85meID9Dq2P1BME82A8RSTf0UQZ815foWkNosSvSAa1jyC6+BiRoKQ/dwkSlrI91wwk6vOOW/wqhoWrWKbFC4RMEBayZwvGPTGTky7S+y9IoiHxdXhkmzT5Gx97VR4dJILC1++i06GVHF97ll4PUy4fLvFMsL5JmMxGPc6wnh+tqKd5MXlIWI7vfVwduRFOp6utPSJAsxHB/Au7qocC1aT5EQ5y4M9of7gacFDnUwKKIFLOunOD3B8iuD6jNqYZG7HbLaOf8fY0WFhBdlxelX2V1z369DtmTHDdozSzGMj0nfCXKIOfVozJJ24UEe+hep+gOfnjub/bUKZHFg5BptCbvqT+gKR8D3yaWnpqMZhEhj8OkM/V9d0u5OV1EL/0DLucso7JSUdg5L4EqdS69AEEUVQNGngX5/bu2Aq/+V7d9T47uvr46n+mofu+avasmQ/I1T2mo3+gO8+l+NHGRisdAS0XIJY/uhOXKL38vGIeHA5DfkwGq844pVf2bKid763oJ+dyAYzPTO/yaQzjG+QutKjGftt8MNtJoKKpZsJ9qkenV689ktzDdBm137ia7e7Odvu3QM5Q/eaL0IR3Yy3BSbDtAbmImdry6ne1nOYbGAxWQ4/7e0fDIWnAKD/FhAtXz6+0bdFffLoT4Hi/KHMh0npf3sitZO1WaZOo90kJVOQ0QWVchseuQ44ODhb50JACTKzWpQEtJTwu6ftZyWh6+9JZzsFkAu0McWTDkKw3EREC3naSbxMr60PgU554W6O3F8V4Xj2bF5IP+z5pt07WxzIiw38G9qF2mDeh8C5xZ1thjo3/LsnOjlYHLN01tL4XLCft2ul4OnGStvAiU0+4/DTGq4m85G5VuoZuCzJtiZmvS7bFSr42xP59GnkUamTxvn3+NvmSCatWlyBd+AMP6hHUc8PBrM1m/dUoi7Gp/h1a2BVD0sAJP hSlh2814 BKngJiCOyLPgZpT1zmWDvA9w2Zi3p5Jwrql/TZb0GFHLchcGHBu5eHYv93lCKthbY2myf5c6itGUFvddwXR6FjJsmq2MtlHq9ebWOpV1Docrn7okpgnGqp/PiCN+mUSSjEp6g4eC2go2xia5toLE9Qsat9mqnuG9ha3zUt7UPtVAPKN1DJ67huZhTCZp8rO8w1VCGmK0pIe/cNYfWZviedZwpcUlGVTvd6+rPVqaD3+W3EMGpk6UG2r1WiEWRk/VDD6vQRBTJ3FrUppYgKC8HjKNbZWlcPH8PUl8IOwHY0DcaOHQZmjQpgfRCtMDeeSoPewQQS186MtIx3Fjczf2smkRhW+2L46/sxYgdZCWJ2PAzmy07LU5hD5tpdFY1TfmUH7VhUOgYpYsjxtUYAKG2D14yf5X/oI4TTHtFlHd3ccXGBe4jhSq2F16v6uaVKkeZ7C/x4JRYFJIsuc5eu8hf94ay2z8VhudNhxwu 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: On Tue, 28 Mar 2023 at 11:59, 'Muchun Song' via kasan-dev wrote: > > Replace ALIGN_DOWN(x, PAGE_SIZE) with PAGE_ALIGN_DOWN(x) to simplify > the code a bit. > > Signed-off-by: Muchun Song Reviewed-by: Marco Elver > --- > mm/kfence/core.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/mm/kfence/core.c b/mm/kfence/core.c > index f205b860f460..dbfb79a4d624 100644 > --- a/mm/kfence/core.c > +++ b/mm/kfence/core.c > @@ -230,17 +230,17 @@ static bool alloc_covered_contains(u32 alloc_stack_hash) > > static inline void kfence_protect(unsigned long addr) > { > - kfence_protect_page(ALIGN_DOWN(addr, PAGE_SIZE), true); > + kfence_protect_page(PAGE_ALIGN_DOWN(addr), true); > } > > static inline void kfence_unprotect(unsigned long addr) > { > - kfence_protect_page(ALIGN_DOWN(addr, PAGE_SIZE), false); > + kfence_protect_page(PAGE_ALIGN_DOWN(addr), false); > } > > static inline unsigned long metadata_to_pageaddr(const struct kfence_metadata *meta) > { > - return ALIGN_DOWN(meta->addr, PAGE_SIZE); > + return PAGE_ALIGN_DOWN(meta->addr); > } > > /* > @@ -308,7 +308,7 @@ static inline bool check_canary_byte(u8 *addr) > /* __always_inline this to ensure we won't do an indirect call to fn. */ > static __always_inline void for_each_canary(const struct kfence_metadata *meta, bool (*fn)(u8 *)) > { > - const unsigned long pageaddr = ALIGN_DOWN(meta->addr, PAGE_SIZE); > + const unsigned long pageaddr = PAGE_ALIGN_DOWN(meta->addr); > unsigned long addr; > > /* > @@ -455,7 +455,7 @@ static void kfence_guarded_free(void *addr, struct kfence_metadata *meta, bool z > } > > /* Detect racy use-after-free, or incorrect reallocation of this page by KFENCE. */ > - kcsan_begin_scoped_access((void *)ALIGN_DOWN((unsigned long)addr, PAGE_SIZE), PAGE_SIZE, > + kcsan_begin_scoped_access((void *)PAGE_ALIGN_DOWN((unsigned long)addr), PAGE_SIZE, > KCSAN_ACCESS_SCOPED | KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ASSERT, > &assert_page_exclusive); > > @@ -464,7 +464,7 @@ static void kfence_guarded_free(void *addr, struct kfence_metadata *meta, bool z > > /* Restore page protection if there was an OOB access. */ > if (meta->unprotected_page) { > - memzero_explicit((void *)ALIGN_DOWN(meta->unprotected_page, PAGE_SIZE), PAGE_SIZE); > + memzero_explicit((void *)PAGE_ALIGN_DOWN(meta->unprotected_page), PAGE_SIZE); > kfence_protect(meta->unprotected_page); > meta->unprotected_page = 0; > } > -- > 2.11.0 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20230328095807.7014-7-songmuchun%40bytedance.com.