From patchwork Mon Aug 12 19:05:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 13760952 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 E0F59C3DA7F for ; Mon, 12 Aug 2024 19:06:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DDA46B00C0; Mon, 12 Aug 2024 15:06:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 441506B00C1; Mon, 12 Aug 2024 15:06:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 294EA6B00C2; Mon, 12 Aug 2024 15:06:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 06D2B6B00C0 for ; Mon, 12 Aug 2024 15:06:00 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9F80C80366 for ; Mon, 12 Aug 2024 19:06:00 +0000 (UTC) X-FDA: 82444523280.09.27E92D3 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf17.hostedemail.com (Postfix) with ESMTP id B8C0C4002A for ; Mon, 12 Aug 2024 19:05:57 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=Ybjwyw+R; spf=pass (imf17.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723489522; a=rsa-sha256; cv=none; b=iKp0wEfvzWNa/FyugyJ0CX6Uf1UXmuVoKy1ALn2CK7LeicNy3NjYlrJMWqbvdr/IRD3g0P SYVyjSJfSvrPIjiVrQphyTAWYqFhWVuIcA4cfJOJljCqkvgeFVyn+/YZtJkUwTKUf0j8fn JiG5/S12YLumG/NfNPNXybRn8FnmzjE= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=Ybjwyw+R; spf=pass (imf17.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723489522; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=hzJpDomWqI4XAKH5M6JOzCbongljBXfxlpCrhMR2RbI=; b=leUte/HAv4bPTfzZVWJQapD4KeMP4CDmN97ks+ajMyXTB3sWmbg1cbIlamSUL/RnGLKtVR 9phmiSA6jQxRCI/qFIQQMKmLHmSONIEP9HDYKBNB4NwZTJ+iEOInvkMXZTkjb/OpCbOzFh cOT2UoqWCC8+Hd8UdHXBejUx5MmEsNE= Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47CHXVMA007029; Mon, 12 Aug 2024 19:05:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=corp-2023-11-20; bh=hzJpDomWqI4XAK H5M6JOzCbongljBXfxlpCrhMR2RbI=; b=Ybjwyw+RMoaTJfi0g6NaelslofkTpP yt7GSIAJN4TuOVEhY2INVgr8SSWDE+ypgAUZbca18RG1gPY3f+RmZN4KcimsX90i fnE75pYtKIvWTKoF3WVvgFKrX4Cz3M9P8PI2j5sgdLt2P0pQ54BswD+DLmGVL+ZX +UfQnLbsA7EvtMKEvHy2psvMZlXXICzMTru15xdOeMGzvRJkWOBz4NHhaikOThj6 SzFut2jr+ZVDkuN72s5/6IQ7fyA11dot/aplvfLel2Ik+wCaa70eMXlPY9PYzl0M Tc5cVvjzqIBtZPRi40X8PCwnXKbdaf4SlKI6DwsjR7IvtOEXNiNpo2MA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40wxmcud7h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Aug 2024 19:05:50 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 47CIhSbd017606; Mon, 12 Aug 2024 19:05:49 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40wxn8dfcp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Aug 2024 19:05:48 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 47CJ22Kf022973; Mon, 12 Aug 2024 19:05:48 GMT Received: from sidkumar-mac.us.oracle.com (dhcp-10-65-176-210.vpn.oracle.com [10.65.176.210]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 40wxn8dfa3-1; Mon, 12 Aug 2024 19:05:48 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH v2 1/2] maple_tree: reset mas->index and mas->last on write retries Date: Mon, 12 Aug 2024 15:05:42 -0400 Message-ID: <20240812190543.71967-1-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-08-12_12,2024-08-12_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 spamscore=0 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408120141 X-Proofpoint-ORIG-GUID: 6I9s2c9p3OEU8v8FvF9ViXXLFMoqIjAi X-Proofpoint-GUID: 6I9s2c9p3OEU8v8FvF9ViXXLFMoqIjAi X-Stat-Signature: nzf4ijhiji7iirz4notkagc41inh9sa8 X-Rspamd-Queue-Id: B8C0C4002A X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1723489557-743732 X-HE-Meta: U2FsdGVkX19F2AOa9J7to1u0LO5tN4vG17Bpj8FjXE2AY8LQP7k9nxzbBysq8gRGINFVMG1CrSpSdgLDscCdGSF8Swau9HE9nzpPveibVkkYUMmTedwEazKhMYENcCrytYn+fW0mD6tXs7x7eBKZFvmZn+mSSVsyJ5nc4T/NOcNk3C5h8LvPhk7VWnePJKXBvRzxY+HBjKHWTrQ10ZHWYSZg7R5QdRMMxZYp9Nl4C/iI0losBml+FJQcIvcVwOn0k21hN08KVuX1ZZKbppZMwF06Q/cyZT59tUkoibEd2rZx6slcb1KQyVQ+B3nfuBGceRrj/sFr8He+RlFPUGgj59WmyDtjxwEHkbXOH+hijX+zSPyXJK1TO8hX36/6mwkP5VU3yRtLnmnVhPg/T86oww2Ip3Mk7Z0BFz12F9N3JEXxwFBzPk1Sfo2VLiJr+GExPDWQrncXtEtSd9BNXC1BuoL5xgH9fwmNrVzzSz7KvCByDhEXJyA8W3YXwHCOOGd1PSSWwwUHNZhg99kA4OOnsCcVa+yeAUuUktkUJE7Ey5dxdle61qcmQNZTsu8K5Uaqo7JDr3dP3HDw7gV5R6S74NQJFDQu7GbjW/mtZLEsb04AHrNYYAlbVamJRdDGDc2dTg06QFCU/9Aan6XgcxZE5o0Ol1CG+2xofKHZ3gxQN9ZO3OmnK09KqIDUftr4AsKo4BqpX7zV5iJydoqmBEpcQLtRIDemU6QqBwkMZSHVOhLrI9SwHSHUcA+KQ1d4Geb4hcN1OJi1HFCinSNFK12oDgssFWsXaKBFFEDJngLs8595Frh9wy3B3xb2zr/Mny1KtiO8QfER8GsDmiGs+fNzSS95+p+FNt9CJNfI8O3iMTeeTc7wsI7zErqM4TYEFTdg4jq02XK6He/H64Z/QkfOkv4dZL3MXBTm48VijEK79EZ9ozIJ13LeWnOPVy9FXy/WYnLn6OMBmEcJTZDTBDm fa+1R95G GFpSHtfFFSUas0SfGnR9XJBprBH73FEdjTx0yz46hf6JXzAogqTOTm1SmLTSWw8+roF8KAZb8fMeatJZ/JWUbo2NxI4RLcGCmh87a4ElTTDrxgIRuH5pi5OEJJ9e3W6qvLBHvmr6EjOk7Faw91G2ru9lfw7bXTRi/5tNxh3LJ76lVYAp7JB9I3HNgEr1PwR5GQKvbgzWqZiPrJRcsEp+39KspBEk1sxC1paKiLo9NTu0TCjeKUXHCTEX4nP0nZOKojhCS 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: The following scenario can result in a race condition: Consider a node with the following indices and values a<------->b<----------->c<--------->d 0xA NULL 0xB CPU 1 CPU 2 --------- --------- mas_set_range(a,b) mas_erase() -> range is expanded (a,c) because of null expansion mas_nomem() mas_unlock() mas_store_range(b,c,0xC) The node now looks like: a<------->b<----------->c<--------->d 0xA 0xC 0xB mas_lock() mas_erase() <------ range of erase is still (a,c) The node is now NULL from (a,c) but the write from CPU 2 should have been retained and range (b,c) should still have 0xC as its value. We can fix this by re-intializing to the original index and last. This does not need a cc: Stable as there are no users of the maple tree which use internal locking and this condition is only possible with internal locking. Signed-off-by: Sidhartha Kumar Reviewed-by: Liam R. Howlett --- v1 -> v2: - re-initialize index and last in the mas_nomem() if statement so fast path is not effected in mas_erase(). - use __mas_set_range() rather than set mas->index and mas->last directly. lib/maple_tree.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index aa3a5df15b8e..b547ff211ac7 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5451,14 +5451,19 @@ EXPORT_SYMBOL_GPL(mas_store); */ int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp) { + unsigned long index = mas->index; + unsigned long last = mas->last; MA_WR_STATE(wr_mas, mas, entry); mas_wr_store_setup(&wr_mas); trace_ma_write(__func__, mas, 0, entry); retry: mas_wr_store_entry(&wr_mas); - if (unlikely(mas_nomem(mas, gfp))) + if (unlikely(mas_nomem(mas, gfp))) { + if (!entry) + __mas_set_range(mas, index, last); goto retry; + } if (unlikely(mas_is_err(mas))) return xa_err(mas->node); @@ -6245,23 +6250,26 @@ EXPORT_SYMBOL_GPL(mas_find_range_rev); void *mas_erase(struct ma_state *mas) { void *entry; + unsigned long index = mas->index; MA_WR_STATE(wr_mas, mas, NULL); if (!mas_is_active(mas) || !mas_is_start(mas)) mas->status = ma_start; - /* Retry unnecessary when holding the write lock. */ +write_retry: entry = mas_state_walk(mas); if (!entry) return NULL; -write_retry: /* Must reset to ensure spanning writes of last slot are detected */ mas_reset(mas); mas_wr_store_setup(&wr_mas); mas_wr_store_entry(&wr_mas); - if (mas_nomem(mas, GFP_KERNEL)) + if (mas_nomem(mas, GFP_KERNEL)) { + /* in case the range of entry changed when unlocked */ + mas->index = mas->last = index; goto write_retry; + } return entry; }