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 5AD46C4707B for ; Wed, 10 Jan 2024 14:52:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0BD26B0080; Wed, 10 Jan 2024 09:52:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CBBBF6B0081; Wed, 10 Jan 2024 09:52:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B83446B0083; Wed, 10 Jan 2024 09:52:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A5EFC6B0080 for ; Wed, 10 Jan 2024 09:52:37 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 79032140B8A for ; Wed, 10 Jan 2024 14:52:37 +0000 (UTC) X-FDA: 81663692754.19.CD8E565 Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by imf13.hostedemail.com (Postfix) with ESMTP id 95A7920022 for ; Wed, 10 Jan 2024 14:52:35 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=dabbelt-com.20230601.gappssmtp.com header.s=20230601 header.b="j74/UVrF"; dmarc=none; spf=pass (imf13.hostedemail.com: domain of palmer@dabbelt.com designates 209.85.166.181 as permitted sender) smtp.mailfrom=palmer@dabbelt.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704898355; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:dkim-signature; bh=pVtS8rM9wqn1PqYUXWdr8pk/hBP2Hc85AVIVtCVRz8Y=; b=omFp/OuEIWbD7Kjpc6O2kfN9sSBVdEUmA/+jCG60TrErz0v4oWTJ5Zk5Z7qWogEAaDRTNe +onnQzfkqeATk9ou0B0dgmgwM/aXVwDvwLLQx0WQyAod0dyboTJ9p/Vp3Kzl7ph4I9fFcl ntM2cCd363DAUURvUEzT2Ik5fmOm8xU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=dabbelt-com.20230601.gappssmtp.com header.s=20230601 header.b="j74/UVrF"; dmarc=none; spf=pass (imf13.hostedemail.com: domain of palmer@dabbelt.com designates 209.85.166.181 as permitted sender) smtp.mailfrom=palmer@dabbelt.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704898355; a=rsa-sha256; cv=none; b=tOakB61a5KAE3YQ6R7UEKxeCUeb2/ykm3WDc82gLFmfgoJ3d9+43zBzUyx3gPXSZqeZnCu Ug7qDrUuKx8afHqHOSlhY7vrzUTZSImi603ZwFXOnYIZAHFGlVcHEnTWU0nny4elOhBbgJ L6LyA9p8UtXAdRbPCmV+qzYP9Z3s/Z8= Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3606f3b8069so19771385ab.2 for ; Wed, 10 Jan 2024 06:52:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20230601.gappssmtp.com; s=20230601; t=1704898354; x=1705503154; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:to:from:cc :in-reply-to:subject:date:from:to:cc:subject:date:message-id :reply-to; bh=pVtS8rM9wqn1PqYUXWdr8pk/hBP2Hc85AVIVtCVRz8Y=; b=j74/UVrFuGlj2vINEdX42Cb8p1GQb0nIRb1603HQWF6nGfYt4dhyj0fuZQpDjI+jkl LDp/AxeGHoOjkDMiydEI89vL1kGenF149yn2JMEyzyTCegLx+loNaZW/MT9nZJEHFc8K UXOqMmYnEynXBOtYl2wq5uHsO1QNeYQXJOCBJcQw1W3rGDm7egQwKho9mcNWbcZr55Td WwMzoB2vWqM7tLCU5YyLJTXNrZ5rh5cuKi5lOU9KnUrLRZD0QiNYVrC4SimcfTKCaU7G tKAR8SlkN7DwIyPEzwvzbtlZb8RDmox6IubHBl5RaXbxQTXQqQkE/FaQ2TdhKCWS0A/d KwkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898354; x=1705503154; h=content-transfer-encoding:mime-version:message-id:to:from:cc :in-reply-to:subject:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pVtS8rM9wqn1PqYUXWdr8pk/hBP2Hc85AVIVtCVRz8Y=; b=jLZjqFiaC7XeCG1oSw7idcN6nX8lz4MS3JpP5MUWqwwNpJUJzFXz4GG7OoMNJcJrJw xfpPHu1W6IPm0CU+gw5qvjr7gThI0+bz3rfJ7mwbvL4qgEsTk4dHEeutbSKw7ygb5W6q dE0GAW9dq9QxQnpVbADQKsC7GQEmUBQHjjq4y+NmjH/my4/15ol9hdUYk+l77bBThF1A StDZvZWoz4NGFxba0O6u+xXsJ1KjsaeSY2sm/6/e1jBpF2kVE/IBaf1D3nqnZWuC1dQg zmEbk1PF7U1AByiBRr5jYoBE0e/7dR1Yhh4Xr2MGo16woXBlo+s0IwIQ3WPd21/vvOfC MhCA== X-Gm-Message-State: AOJu0YzxhzQGU3OzRCKXnO4ZQ0NBCgtSFbK4cwO6OsCYk92cccX+OXby dBvgw+1aHeHKMeNDdJzvkEcbPgKW77QoDg== X-Google-Smtp-Source: AGHT+IFvaD94WRGIWckQ9Hv3P7P0TvTdYRGacf1iIOKv8qIUaj9Zvtv4eSDrKd5J5ma8n/u1tTQeFQ== X-Received: by 2002:a05:6e02:34a0:b0:360:90c2:f7ca with SMTP id bp32-20020a056e0234a000b0036090c2f7camr1673156ilb.40.1704898354434; Wed, 10 Jan 2024 06:52:34 -0800 (PST) Received: from localhost ([192.184.165.199]) by smtp.gmail.com with ESMTPSA id bc25-20020a056e02009900b0035fabab7985sm1278883ilb.21.2024.01.10.06.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 06:52:33 -0800 (PST) Date: Wed, 10 Jan 2024 06:52:33 -0800 (PST) X-Google-Original-Date: Wed, 10 Jan 2024 06:52:32 PST (-0800) Subject: Re: [PATCH 1/4] riscv: tlb: fix __p*d_free_tlb() In-Reply-To: <36166acf-aa32-40b6-806a-ade59bc645ad@ghiti.fr> CC: jszhang@kernel.org, Paul Walmsley , aou@eecs.berkeley.edu, Will Deacon , aneesh.kumar@linux.ibm.com, akpm@linux-foundation.org, npiggin@gmail.com, peterz@infradead.org, Conor Dooley , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org From: Palmer Dabbelt To: alex@ghiti.fr Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 95A7920022 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 3aeeqkceppf3shp7b3mezofb3ndkmkkf X-HE-Tag: 1704898355-38153 X-HE-Meta: U2FsdGVkX1/pMQEtMos/HqtW7zSQ0Lwp13QODaIAMm8lG2BJSaS+OCpvGIQ1gd/5e9GttKEcPoJaj/ppnzKXuS7MTP1aWvSDvSJDeefPCEkRUWesQrNO/2IlmxRp0lJ7kFYsXPhMqo5bvSYWmzzr5S0uWJYVG/LAVpvxsF9wQenHefXacyEQQO/siyFhLBhBNqaDbc5Wo4nFaj0RaqMT4YmopWugmDhiv4betFWr5MCUW3lsoJy8iRwUuxb781KZECvHczye3sEqXOccbijKv3aMpZeeCxHYOdvgOS/95czH7EG8rd/ywZPd9ch4rTCEaxM12kopv4xDm4LKpB3LYAUdEfSyBfcKX4KDtGQ0wwfAjwI2ePHHbW9Ri9yKKxNNZ+JhmVk420H5Ib9tZ80VLM8ENK6OG6Fr82LlAxYl/4mBtkx55J8njYqW3rYOOYrQSs09ht0buHSl50N0MrlZ89N/tyvICCVF+Iz7Djc4bQEcex3RgTGUz1s8/Fks5eAV9O7pLIBK+TmzjlsEK1jDi28adMz4YdtQiUTEptp1PTBMD1M1DLj6+Dyz0fQaTElwFF2asEn0qP2jXd29nM0I6G34Qr82YJN7eYmUNJrMtnDdRzyHyCGhdulcQ5ew3bW7n8OmsiM0hbFNd4wW3bh33aK9r7ZnriL6LYc1bJq0ulA7op1D4F2jf026opmdc8ts3739I0/bwRVdt7p107do3iO6dSdoylO1Gh6yQfSDdM9iUWS4a+V+eIenSKXvADmHDQ9p7ZOd843uaR2zaA6kFEmOuZcmOKeioU3kVvbjKAo7/BvL+wOzX+R0Xm+i79CocSsz7l0Pwz+U6ZqtgpG5M7I/1T4exJYT+iy0GcRTD5tY1WS76jPw/3Zzt8hm/lIS4T0tFzsu/wzEHzzSFbljQrvlly9t+DbuFrwVxUeaXJ6U/1J0wUgMAxIDGhRlZiR4VwdoceSu7dg5DfuTggQ 81t4kKur f+1bS7/NnX9qqKD9ox6Hxg0G9CcklqgsCoaKyxjz53ovaCCRUxHhUZw0qxA+YMsPY2wpc3CohlOkxDmEexQEBkszBHtOlTEBukHdLm6BHQxNE75iQpCW8xUgJSaAfHufPFr3pe2YMCOTyA3/eXfHnxAxafC1VCvtmrpPMPnyWa0eF2Euto5NHjs8Ln0g+HMVWdk09TdhXqJKXdPJn5j/840TOBTfUpSSY+cyYkjKoU8QRu0Ky6rw0tK92I2D6p/9yTtuvOpgd8jHNbWxd3PVFJE5Knl3COuue0nrslbkQTSW6ekgjDo1QW3TDyFk72xlZ2YWjOXtCICnpmHUjZw95AUJMtQI+xVBDZA9/Z5citsWBWjo7IbvvwuituU5JUz+mcXrO/+FcFT2RbSoJMSnQYuFia9IkSLMRlfqktLobcO77E3ftGlOuDuy52WefRugKmZu1h3FZ60BU1T/z+JIHHTxBTzwyBK9k2ziQ+Ly+QS8iUMm2IOCe2ZRf3emGFQDCQdg3LznjsbkG4X0955SdVKrrqJO7Ir8KflbmKqks377edG7HKp2BSuL39jYXvSxMoGOm 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, 04 Jan 2024 02:55:40 PST (-0800), alex@ghiti.fr wrote: > On 19/12/2023 18:50, Jisheng Zhang wrote: >> If non-leaf PTEs I.E pmd, pud or p4d is modified, a sfence.vma is >> a must for safe, imagine if an implementation caches the non-leaf >> translation in TLB, although I didn't meet this HW so far, but it's >> possible in theory. > > > And since this is a fix, it would be worth trying to add a Fixes tag > here. Not easy I agree because it fixes several commits (I have > 07037db5d479f,  e8a62cc26ddf5, d10efa21a9374 and c5e9b2c2ae822 if you > implement tlb_flush() as I suggested). > > So I would add the latest commit as the Fixes commit (which would be > c5e9b2c2ae822), and then I'd send a patch to stable for each commit with > the right Fixes tag...@Conor: let me know if you have a simpler idea or > if this is wrong. I just went with Fixes: c5e9b2c2ae82 ("riscv: Improve tlb_flush()") Cc: stable@vger.kernel.org hopefully that's fine. It's still getting tested, it's batched up with some other stuff and I managed to find a bad merge so it might take a bit... > > Thanks, > > Alex > > >> Signed-off-by: Jisheng Zhang >> --- >> arch/riscv/include/asm/pgalloc.h | 20 +++++++++++++++++--- >> 1 file changed, 17 insertions(+), 3 deletions(-) >> >> diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h >> index d169a4f41a2e..a12fb83fa1f5 100644 >> --- a/arch/riscv/include/asm/pgalloc.h >> +++ b/arch/riscv/include/asm/pgalloc.h >> @@ -95,7 +95,13 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud) >> __pud_free(mm, pud); >> } >> >> -#define __pud_free_tlb(tlb, pud, addr) pud_free((tlb)->mm, pud) >> +#define __pud_free_tlb(tlb, pud, addr) \ >> +do { \ >> + if (pgtable_l4_enabled) { \ >> + pagetable_pud_dtor(virt_to_ptdesc(pud)); \ >> + tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pud)); \ >> + } \ >> +} while (0) >> >> #define p4d_alloc_one p4d_alloc_one >> static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long addr) >> @@ -124,7 +130,11 @@ static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) >> __p4d_free(mm, p4d); >> } >> >> -#define __p4d_free_tlb(tlb, p4d, addr) p4d_free((tlb)->mm, p4d) >> +#define __p4d_free_tlb(tlb, p4d, addr) \ >> +do { \ >> + if (pgtable_l5_enabled) \ >> + tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(p4d)); \ >> +} while (0) >> #endif /* __PAGETABLE_PMD_FOLDED */ >> >> static inline void sync_kernel_mappings(pgd_t *pgd) >> @@ -149,7 +159,11 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) >> >> #ifndef __PAGETABLE_PMD_FOLDED >> >> -#define __pmd_free_tlb(tlb, pmd, addr) pmd_free((tlb)->mm, pmd) >> +#define __pmd_free_tlb(tlb, pmd, addr) \ >> +do { \ >> + pagetable_pmd_dtor(virt_to_ptdesc(pmd)); \ >> + tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pmd)); \ >> +} while (0) >> >> #endif /* __PAGETABLE_PMD_FOLDED */ >>