From patchwork Mon Jan 27 21:31:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=E2=80=9CWilliam_Roche?= X-Patchwork-Id: 13951722 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8551A18FDD2 for ; Mon, 27 Jan 2025 21:31:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013501; cv=fail; b=sA2ejMBPiQth1eV3+OZSwRQ+9IjrmSxg7UM4TBLJjEZNMwNyjPuiCIC/ZnYEDvMRbAWzyZFUbgDE5Bi3lY8gKAMgy00d/kwlughrJtPJSSn1kNtCJJGtjWrKyNL5uYEWuZm0Wxx3/SCnT1wAii8Xgz8YMC0R0VoMMXZkEZDH9RQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013501; c=relaxed/simple; bh=SV6ViL8xPtTJJuEh+x1c+lz8W+mwHx10EkWbVaf9s14=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=M4sjD27AbOTMMiJHBm7VzXyqhBtbJOTxJ1caZGF1OdnVdH1cUkqlRytoBCxudZjxMKdVChS1YJoMwJ8la2V1cDZEnnTGT5l4KUC6pOyeH8YGtUZUIFQP0HAL101vJmYQxRKKiYdlWow3WWwhErc9OjqOJdZGUOygUKZn/ffYIcw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=CPkc/2Dx; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=EoGLkqIE; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="CPkc/2Dx"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="EoGLkqIE" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50RL0r9Q024672; Mon, 27 Jan 2025 21:31:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=5anNKywY+1Gwgr8+RChwjIgkuGE9CFcg28ydEzK5lgs=; b= CPkc/2Dx8q6+x06LWretT4c606hLZvUjc5x6sLHUHcGotZeYFL/48CPzSxYtcm9r wdZFMPnWKs1QlduEVVCCtmn583rOrzWqcJEC2GqsKiy4GQDP3xU0+G3J81r/N6CO 8LgDeEhIUl1/M71is9wvR8wA3hSXIYH+yGdmvhLTeRkDfIcy2Jyw9Fnpq4Jr29eV yFqxM0ctvEdfuQ93zr8Iay6ojCkvJ/j5R3rq365yowPwssk5jMdOSUai+/rAy8cp ZugagCe039G4nszmgZpaiC2i/+1qPKK8IGIkHJMQokKuXIvFD0orQzJRd4zm9Dz8 IrxZP9XBhFlFhMeSJj9sig== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ehpc825n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:26 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 50RLFbju003407; Mon, 27 Jan 2025 21:31:25 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2049.outbound.protection.outlook.com [104.47.66.49]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpd7k1b1-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T+RtGgo8hXD6P64IJw5tcVvScfGlq8OZmPCKoP05/V3+dHf62965X33PhALzsueHFD7n3RLvFFKrmBHrTtVnaD3Fx0m2iw06Bk0H3tV6A2bj64Icnf1psPK6qbX0In5Pi5fgmwL2G88AyOwOM37PHxvrey53iugztg0TNMy+WcBJmGcnd2eUOFqu2j8y5lcR/E3Q6sdM2AkrUcZ+2DY6v/tFuSJ/INz5AJ6mZPfKTQ1V/IGr5xmOdILSHfC2a45tdHLMNZxTSedhBWLWnTM7phX8D/j/AzWsMhDLPdpxSqHhZ1bWPY+hxp0MK3QZtyd6pGTtlOaHYyO7aHq21QIfcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5anNKywY+1Gwgr8+RChwjIgkuGE9CFcg28ydEzK5lgs=; b=bTDLCARcLzWuREu6In1mJAu8/GbVayKpNZfl+qrCXilXlVnRsmFpikOHeMyjL3xTtGzGuvMJPKae52b92BqgAfqDbcdWoKGd3U3XF04r2fMWf05yqqhTMI6N2X/I39eZc5MV0aXKX9t1XEQwarRJACkgPfAgYKZ/TAXrse7N8zLFvoD05mGmOSeSCaFhcei25QWua8mt8rtcResKeJ7/0OAu336KhzF13Hy/hkumKWR6MpSIFUHpq7uc16metsQtZEVOULKhKhuWr/r1qbER1FF5aRCzYfL3Lt8WJJ1tWSEoF3ca1surIACR6+aXbnI4PrHloUXdABpQS+CIRHRIMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5anNKywY+1Gwgr8+RChwjIgkuGE9CFcg28ydEzK5lgs=; b=EoGLkqIEiU71IlfxmVEoUkkqnx4kLAqMwv9wUNDWyKS0VaI+x7evkAzaFLn/ycHf97zm+AivCBaoTNQPrKaxlpoZdG8Ix/vK1Ysp8ORGVnjsxVIgxo9CAZEmq3298cFJJ1w3Knn6XPdZdjaktKyaz/mKIxhHxvSbFLUZtZ1AMb0= Received: from CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) by PH0PR10MB4614.namprd10.prod.outlook.com (2603:10b6:510:42::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.23; Mon, 27 Jan 2025 21:31:24 +0000 Received: from CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23]) by CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23%6]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 21:31:24 +0000 From: =?utf-8?q?=E2=80=9CWilliam_Roche?= To: david@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: william.roche@oracle.com, peterx@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, mtosatti@redhat.com, imammedo@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, zhao1.liu@intel.com, joao.m.martins@oracle.com Subject: [PATCH v6 1/6] system/physmem: handle hugetlb correctly in qemu_ram_remap() Date: Mon, 27 Jan 2025 21:31:02 +0000 Message-ID: <20250127213107.3454680-2-william.roche@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250127213107.3454680-1-william.roche@oracle.com> References: <20250127213107.3454680-1-william.roche@oracle.com> X-ClientProxiedBy: LO4P123CA0288.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:195::23) To CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR10MB7329:EE_|PH0PR10MB4614:EE_ X-MS-Office365-Filtering-Correlation-Id: b1aef843-d5c1-408f-0508-08dd3f19f2c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|7053199007; X-Microsoft-Antispam-Message-Info: GfZ+jz71KpmWy/IycgJ+5i8ybRU/a/XnWOsZsa93Ufw4u0LFRZmZhzno4YwBKRrrhdrWJWiZiKrUKWqbbotjLlA6neZpY0jebA9Yfs/EImHGyemj0ZuOzYM7y7w9iouJiaxKdn8N4a7EshVydAM1kLkyi3zNc1HynGF839neaHMl6cpeOCLExHG/qBNzqJA0nAz1mZz5+k4F7AucFDpq73NKLWUICQ+RI0XYhL7WQ/sXpZzKwjQOr4BZd6RnQAZxnos43WjiY6WO8LspqUBL9zTMn4RYYhYrahQqzHaDI/kiuOR1Xl28h17Yx2gtA79qovru/HbUDSrOfQZSdldsRs9xlRqGBtQQSdA5bmgds+26+cMmWHsvMISZm/iOHyDCce8aOiQpo5/kCma1H6Ejzh40k/2BMZ8Z4jZHdnG0AeSdqUdFlfo/7qoru/Mdi/MEI/JkO9sM2yFssBg/mcCdOmGTXtkOuDOj8moW3tW1mRM7O2kmwLz7eHtAaVv5kWMdjPZ0ZRe7bnPerpnBbCFcIMp5dmCG7Xj+Gdui/OwfYevjBfw7Ed2aEnTIAjRpiJsvfWszPdGjp5LiipRSU+V63HIUBzjP8GLC5oqPrwKkEplBNub3CpK3KORDXMu/D6JohVBsNOj62S03CM4ALuLAYZTCldSJ7vQo7ojvFfCp4ZGn15Zok7rXDuwpu/XXfwv+2r2hdrp1MQwfY8FY7JejCLO7ylj9euNZ30YhHqRbOmmyNfFkzmcn1G0uRiJELbgjK758ZN/n6YDZZeS30vWdawKto4jhD62p4ZYnUUGWddU/YdnAheuy0lMQ89wejgAk5uCQAUpZ+sKclArmqdO4pjZCMjTg0g06UPSqNcu+QrVNHJ9NSCnbGkgYNniaIjB6BAn8/xoZrZ+ipEr6wP0e+30xLuOdJCVp6n+NxXciHxLR7pC1v7ss1aSWLZx/Z26fMNvtuH7kAj3gY8MH/GpzXy5D57HxRq4w9hQC6crOrJH1548aBbHLWqVWD1+Sm3H0GOo+ukPC2vCqE3XkGU/65KtBvSz6P5mxggLg0n7qYkoYiFz/HHGAStipxIh03kxx3ZbGvXNfI0CnhIHUZtV9ppUwdgb3KX0UOCZ9BasDumrbM4mMLkPNiNrZddAUEaeHvFkDRTnIL3xHQYlUyAzZVWG3vQUPV/rEMYxEd2Tx7EgWdshMBpGsAYW477ZMfti7+CD1xvCwHva+T+BFaUa7ScfXpbrO0qUei3MXIQ5STGt3qPL3bqhRdvXO+ZUAfWr1xdsS03pw5xiiVT7hvrLQpFZPlJiAzcoqwn9ge8rfcFli2wd5ThIdzwj0abDPKtPB3Zv9PG+a5hX1CkRlLUY/OiOnAz8nTeWjV0Tqid5yGpmjo51074iJEyK3QxZbFJQX X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR10MB7329.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cUzIJ9b+Lq+LL8UQn8Od3R/4T7YqX7AocawBPFWs2Jeza5VTnDa6NDanntyMXaqra4+7wE0HVW2wesB9NxWtKxc92j4H2wx4Pr1+z5Tzx8SJ4KPCNfesYq4fluc6Iy6oBv18vPSkRD7xgWsn4gx0xTRVidy1gHxC2JECeioPtvDjqgydx35qGjkl7wu6tQ2OjYA3Qw++ZFR/LVlGLAR/zCMMyXWLZVHSM6gKJs5Z1s3TANrEpE0XWmvvunE7QC7qgNsc5AD7436+QJtpztkkquovvo9/L2iewKJy6ULSuEH1PlEN6gXneelTDMFP3kCLu9uZGUkwGbhlXHWvkwOetGsTWDu5maPHv6mayeWT+99rjWxVSc+gl6IcEPugoKmhWfr4u6ixewoSmyOqE8gNG2M77X34u9w6XYFKzheNSxro/nL2Sr/L/sxgmI/rArU2SFzwGFVOKqA/kymIF3lnsjvDWDKijyEbpQ88+PaIs6gUHXObfJFG0uKR7HlSWHxHLqU2DMKxB3SEp49zRK46ISkSjQYwiKDyt8ebvkkaEUjVdRvfMX/XYKzOsEBgoijy90H3jPrAXIwIfX9VHirGVgDZLfIQ1v9DU+jsv5tJWBdy4OFxSZFz7d2AEdpqpzCNZXBaCmb/SdqpH0uJ2y1F3DZ+zyegZdfv23NMEeyleBOYg5nBhMXjGguHKsaKiKINRmaJGUbDNMf8CILlnNhKuruf4lufApj5mWJ40hYcEPOpkxI0TOEH1LOSlXk41N7USHSF4YZuTR7aZYQU6LOv5Twk7iG0trBdXzv1BvDGgGT3JJiFBHOKjMHIEqqDUxNCKFNAk1AL9dBFMx3hI/IgOaJ3Gy/hw9edAueRvTQZeHDbYkIpikmB8QkTSVyQsWkd6Ukr00A+u45sQwudB69AnhyrLewDhb8VX6zw2WstXINAfy1OHmx9g6YNBKdllFIef+SQ2+zDU6GBU2sjv8gpIjAVpjHYK6M/hQ2tR/mGrNy3P6wUVRGTUQiPUs9NFvE+aVVOei+wSOZEejscB/iXUY2tEQ5MUNbXn5Rco6fS0qsycTb3BR9WvIfcgz6OfwcHLls23g4IfcwpFcF1sixTBDQDv3ZoHDIqLPl9iuL1PSGrTAkS5Nmk8mfcyZk85Grv8SJlDAHhaeQukkz7dg1Ccptlt/8g8pwCyXzz7oXRYR6/mKUKCZs0LXX6cGzAKjGAhcgt4Ssp2FEm6svVWJF/pLOv2cH7HGu00E9J7u5yqQ/e+8i+nHAE4OaliNjZVBoHxwNnCeo4s6VRAF/m/YMLTBIotbo1m3wiDdImTdEhXanSC2uJkkHRrG+pL4Il5KetJ78TGCHcxRGq8oOZktTw8fXRQkt1jrqDstnFpjkBuH/2Y88xgosYZyZqQFPe5BoWhTZWeYxlJviJYBvAQLk3ajLotafxTWIAPO270s3ZifBIurcXK8K6n+/mfKnueVN+ki0h6socoei7YljNIXGBDY5q/lDQOYfmPtvHfCtH6olalW2s3AElPHb59UZxhaNZJYBIdbqV6IIePqMCZFhr31zn8M+i4AwoYp6N03nyqGHhnlM+rmU1s/cSKDqxpC8PCbH0rIM07Lh/7nRGOvuL+g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: g8baaf1dtdhIpQXzR4Krua4szPVKSzd9MpDo0CaT/cIUwRbvtwJfyPpg/4ugxDjtUtm/Me96r2ujwS08EFQcgTZEHap+0PCpRV4NtkzpRjyKdJRtoij+Boadfhz7YqMUnsf++9L/fFJ2g76OP8BZNMonAyEsYuUnOx2Q5vIQYOUKZOc6GxUgVxh6Bpq5s4zpLl8KdIAkcl8febn7xLCz+93UIOoqnhGCPA4P8dtZ6sfqvaRSsjiR53ZgpnN8V9bFpLWqjCUKsN9NSxlgJzJaex4dQxiL6PwRr4uJFprWLbEZ2FI789G9Lqr2Nkt4VB+6J542PMcQyqUTN/AraZvKRnwbC6recCpmRwohwL+Su66LoNi3+hLhJzmq7LisyR5cO/HnFgtcIlsLmovx9uot/xPjlYRPuKGjoeu94tXqbQmHHs6Fj1689hZg8Zyw8RTF/Kji8BUA7gt7q3lLaNziH/H/dpQL2Vl7knFgOfmu2B1D8uvQ9kE97LQxHdqLgsSXhM9qK0oL7Kdxzl3Ci1QrvL91qOnZPm3BYQ9b1IGF6BxXIH2ZfAc2qeI1VO5tLErdLx5lycWlcrvvYB9aG+qsulIlCn2b+Qx7qQPs2Ti3xGY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1aef843-d5c1-408f-0508-08dd3f19f2c6 X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB7329.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 21:31:23.9219 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WcNpoXz2MW0+d4+VM4E1HxubSL/s9LpIYBRlMKpNs3q5CrECK2vSa0A6v9FLX7BXcu9D26cG/y/drp96CPLUN8Th97mJ7/GbQsQAgeFMCHY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4614 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_10,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501270169 X-Proofpoint-GUID: 2Z7u03felJD2kOJCTn3WAIuPWhhvlwqG X-Proofpoint-ORIG-GUID: 2Z7u03felJD2kOJCTn3WAIuPWhhvlwqG From: William Roche The list of hwpoison pages used to remap the memory on reset is based on the backend real page size. To correctly handle hugetlb, we must mmap(MAP_FIXED) a complete hugetlb page; hugetlb pages cannot be partially mapped. Co-developed-by: David Hildenbrand Signed-off-by: William Roche Acked-by: David Hildenbrand --- accel/kvm/kvm-all.c | 2 +- include/exec/cpu-common.h | 2 +- system/physmem.c | 38 +++++++++++++++++++++++++++++--------- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index c65b790433..f89568bfa3 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1288,7 +1288,7 @@ static void kvm_unpoison_all(void *param) QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) { QLIST_REMOVE(page, list); - qemu_ram_remap(page->ram_addr, TARGET_PAGE_SIZE); + qemu_ram_remap(page->ram_addr); g_free(page); } } diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index b1d76d6985..3771b2130c 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -67,7 +67,7 @@ typedef uintptr_t ram_addr_t; /* memory API */ -void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); +void qemu_ram_remap(ram_addr_t addr); /* This should not be used by devices. */ ram_addr_t qemu_ram_addr_from_host(void *ptr); ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr); diff --git a/system/physmem.c b/system/physmem.c index c76503aea8..3dd2adde73 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2167,17 +2167,35 @@ void qemu_ram_free(RAMBlock *block) } #ifndef _WIN32 -void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) +/* + * qemu_ram_remap - remap a single RAM page + * + * @addr: address in ram_addr_t address space. + * + * This function will try remapping a single page of guest RAM identified by + * @addr, essentially discarding memory to recover from previously poisoned + * memory (MCE). The page size depends on the RAMBlock (i.e., hugetlb). @addr + * does not have to point at the start of the page. + * + * This function is only to be used during system resets; it will kill the + * VM if remapping failed. + */ +void qemu_ram_remap(ram_addr_t addr) { RAMBlock *block; - ram_addr_t offset; + uint64_t offset; int flags; void *area, *vaddr; int prot; + size_t page_size; RAMBLOCK_FOREACH(block) { offset = addr - block->offset; if (offset < block->max_length) { + /* Respect the pagesize of our RAMBlock */ + page_size = qemu_ram_pagesize(block); + offset = QEMU_ALIGN_DOWN(offset, page_size); + vaddr = ramblock_ptr(block, offset); if (block->flags & RAM_PREALLOC) { ; @@ -2191,21 +2209,23 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) prot = PROT_READ; prot |= block->flags & RAM_READONLY ? 0 : PROT_WRITE; if (block->fd >= 0) { - area = mmap(vaddr, length, prot, flags, block->fd, + area = mmap(vaddr, page_size, prot, flags, block->fd, offset + block->fd_offset); } else { flags |= MAP_ANONYMOUS; - area = mmap(vaddr, length, prot, flags, -1, 0); + area = mmap(vaddr, page_size, prot, flags, -1, 0); } if (area != vaddr) { - error_report("Could not remap addr: " - RAM_ADDR_FMT "@" RAM_ADDR_FMT "", - length, addr); + error_report("Could not remap RAM %s:%" PRIx64 "+%" PRIx64 + " +%zx", block->idstr, offset, + block->fd_offset, page_size); exit(1); } - memory_try_enable_merging(vaddr, length); - qemu_ram_setup_dump(vaddr, length); + memory_try_enable_merging(vaddr, page_size); + qemu_ram_setup_dump(vaddr, page_size); } + + break; } } } From patchwork Mon Jan 27 21:31:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=E2=80=9CWilliam_Roche?= X-Patchwork-Id: 13951724 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3CBB1D7E4F for ; Mon, 27 Jan 2025 21:31:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013504; cv=fail; b=o68VWUL/Pvx4Tdm3/utNgCT+eKZB48KUG9C3HbW4Dc0sUuFa9uxw8jkdyj/8niDXAFpEyv1Lhtm5qxX/ylPQgEqJfwsndRuoMQlSGPxtK3bNhM1/fC+Yk6nAgy3kKOAx93S/am+HUWsQEfChQwtLyCLj+Go8vlZ7Ecv/FZ+cc5g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013504; c=relaxed/simple; bh=lXlOeau9hHhGWppbHHm1XIRBXbPix5k0ylaDw1uWguc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=iR9KlJpUnskYb1J7vIOc+G4qG/Dqm+uQKcpadoNfXOLGqydyCQz93Qqe54/VDID1jtysrqxmWAbCeNFi6znCDZC/6zZ9MZLeaFyC61agWoizek7wIRfbYDffH1p5hVyb08o1pNZax1EAxE0xHXwr7gFxl152B8EIBf+hzqRehUM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=EynJd/os; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=TngNXf9G; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="EynJd/os"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="TngNXf9G" 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 50RLR2H5015031; Mon, 27 Jan 2025 21:31:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=2Jlw+KA+dy0s5soAPwah4SwL5d+bTAa+rRU0oNp+9gQ=; b= EynJd/osXgU0/9ZrOpQHdxKVvFTYkRefsaUwYslZlu/K9TaTOFQ2mSebnp8zoJyY Zx33MThOwxqENFQPiEjm3VmEY6qjZ1cR7w8yLiK6FHwBSzbaGFXWHdGkYF3z5l4S muxaKWq6a9pdTmfyhS7lwJcHqz5KpdPSQHNPik0YQMp3spz2kEV9hZH2uSo66xey R8oEtiR8gUr54+tF3UPURx+1bc4EN/w0U7C634vD4rPdY3PA5blecWOwAaqNkjXA qvPkF5dOneiyf/UlWxGg+8V1BgF9ZOc5u5N9C9m+sp9AykCI+gYoAOLXIJhJCi9T ySr4FCz1pJxDKTvdzIvy+g== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ej2j80cu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:30 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 50RKBEFY035875; Mon, 27 Jan 2025 21:31:29 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2042.outbound.protection.outlook.com [104.47.66.42]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpddhxgn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d6f9p/+CHoAQmN/hTh2ei2V1RLX7Is0WIX/cLedwK8v5eZbZD/igKqNxcwxQ3eRnZeiRqAB9RoRtSsALPMruwgm0Ui2dvBe+3dVnFckPbOVwcjQbTQLZZTTRCTAWwSlhQB19HEJ1/hIC7yssv5EzbF91WV+3i4apXhyB53R3akvWL69jip9eQI7XLyE/Gtpi0HrlyykVeWeC8yl8k4vcgCf94UylRRiQDc09yHc5Pe2YimhV5aluQGGRcBA4VGlDSVhrAnvu5/Qgp1xrH1IM+ldaIINiuAIOebuDdDJ7isRQGU2sR+yL093YkAE58fv0pSOYaTFMwz1Xv13Kb6VzOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2Jlw+KA+dy0s5soAPwah4SwL5d+bTAa+rRU0oNp+9gQ=; b=A2kn3iVWloC3sLtYAgCBlhAx1lCw2gYheeULNPT8HckHVUARXKLDOt4f1Se8b9cpkBO3NiTDC+G04dHiVf046ybxcRkmBQk7UAy0LHYslj5hGB3M523aEquul/H86dkbmxdC/3WLeNe2nlWtNUZeolSXL+lsNPMFhV1lhHdCzG/42QeyD7dlc+x3U2ysGes6/bU5vO670jRd9BU3+IcpBDxnCsioHnIbWs9aGwx36D+isCQ7BTJwNrQSxB7EPEHIK4SLgjClEmcYkKVF3NxWyH6o3R889H0dSQbfYhnMlhU2Q98I+hbJx+Pe9lwZ729ViZAlxDIZMZL7d3xtKFndgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Jlw+KA+dy0s5soAPwah4SwL5d+bTAa+rRU0oNp+9gQ=; b=TngNXf9GTRR88/tupGky2JgttPlfywpfyKKzUvhZ97NtvOrjFkWiuspEiGHuiQocXQjd0jVPv+0JZkoGnfH7I24JqFob/lekmC44/FT4bwYS0y93oIZBCwM2JX0s1rBJ9L6HnvOserA8TCJx9J6laldHzt1rFMBDs5Kcg2LhKhI= Received: from CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) by PH0PR10MB4614.namprd10.prod.outlook.com (2603:10b6:510:42::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.23; Mon, 27 Jan 2025 21:31:27 +0000 Received: from CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23]) by CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23%6]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 21:31:26 +0000 From: =?utf-8?q?=E2=80=9CWilliam_Roche?= To: david@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: william.roche@oracle.com, peterx@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, mtosatti@redhat.com, imammedo@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, zhao1.liu@intel.com, joao.m.martins@oracle.com Subject: [PATCH v6 2/6] system/physmem: poisoned memory discard on reboot Date: Mon, 27 Jan 2025 21:31:03 +0000 Message-ID: <20250127213107.3454680-3-william.roche@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250127213107.3454680-1-william.roche@oracle.com> References: <20250127213107.3454680-1-william.roche@oracle.com> X-ClientProxiedBy: LO4P123CA0285.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:195::20) To CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR10MB7329:EE_|PH0PR10MB4614:EE_ X-MS-Office365-Filtering-Correlation-Id: c080f76c-0a11-4ddb-8551-08dd3f19f49b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: E39DhOBJSxtmnePCyA6cEO2GyqVFO5fBmCiKaY/v4y2DkIuLA1jq3B9JGB22yGACLZ45Rb1QigUEABkGX0iV83ttrur4dQ6oF6Sm8XxzeQVq+6dQR5X15xorfRSoltknt+WQT0oWGTiwvcc9OuXBmxzIFAcxDo9d51GitNMFDV+UWEdzzVSwxaqVdIT1YILtl+SXk3BvzWZywL5LLq0ROcBGvHpn0oe7AvQ+yXyuicLP3r83XvCJgowaJU0ZbLLKsFeYmO66OA4z/p2lpTnVAZ5XtnHWneQfyL7UduJ51lkGNCM/bLcGzRN0zJJi/wt+/mO3uw3RsjUCZ1w9twOjGArZIomfn/vJE4h2VRzEasWjqWKRCZouuaWDuPusUpT3qpK02zWXfG0l0ZcZs1CGf6utyVvcQPUNoOMNrY775jPgbsOnieQGO/6V78rBIdDaWTOECJUDnDs03vd6coqoOfQuDl0PNY9itx9+HgANTLdOPw1kQjnB3KP5iMmipCNbZhYHCvOHUXDX3oS6zfBGQBJyEv7mLH6TmpperOrvm+v3WOwsH/CE888NgYffJbzrHXJsV171ojitEr1AtE9FNq8No+nSY2Bwj4CzET97kUXxlePYyJMW7wMrhmUq/fl4SezCJp4vHKbcEyS0B7ZeYScwktyoATawFvNECKNoH7zeza3Ekush3by4zRcL+oRfUwTVhNSRHjn8mmwu1ZnQMv3yQG7OUeJVyl6yGlrdOZw61Uw0mhinjjlLe0O4iFWCE8/vbvY/M0hF220YpdbVY1cbcWu7Lct7CeKs2ccuOyvE4jBZJ0h4HtJ678ERgDJ/zvYrhUCF8PWGzxNvJ8EBF4kZn/RJ51MUkhyqOLLGH578fp6DKP2zxUbaTp6HCFneRjq9z2QvBRdHHisJM52AuuYAlkTLIVApR6OVii1FxPaOr5PZuBSVs+P0iSMXWZSVOkOEkg5C7UPJ+Sj0wxz6DmbIUSm1o/vVEDdupoYeJ3t8Ase5VcqS5cG0pQZfJegnJAeAhs3Gudz2hRNhbkgKpdMQM0K/Jejr0zxkTvDJ2rH6t+sh/6ZbhzMW5bNtryZUsVJNMMWRC9SimXW6b/qS75ISwHIy9Hs7Px6hTQk8ZQ02Fgh78wDCdPCFqpKjJ+wLynMeMl8K8t2TdNa6CpbyL0kJBVPBh8uJxtMPrvPG1lC1BKGzOEioESXCuYhDGBLQTQA9v+wVkIea9U7VwOGqkzRwWSMfK8yySKJ4u0a+ChB2wmPQ88MC6XDfX8zLSsYAMwzftoASpQVfEhqEwTWDvVMWCXj1KCh7fbioXRw5pqENY9NO9wLBe/2wFWQLgy/e9zxn/r2rB7FMUXZYMA+MubL4JRO2CM2JpXzAwlGWguen0YIgPtaTSQyiEDIW8Tq3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR10MB7329.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yej6SeUx/OVbAZMG93CkOgM4FBQ7tejlM//FSs5k8QLswokV9hdNZlcctwPMlvJxV0gVErHFS4oXjHn6tW1opQCWIsWuT0WIMRtTCGzI6SU4E3WT19cMWmksAJoh/HT6sIUy4NA7R1bZOtfFIXOTltOzwT829paHWJXKhPQETLddP1GdgsDYZQPiiEPNsNAImGW6PhlR0l9ZrWmqqu7EyaE6Nw3JZoUJT7Lp6udeY9wghHA+TEezPq7dWqBu45ciT9m3AfNuAekm8DuyCRoCpWqNidjbajtmwGKnBZ6fkOhfjTY5LyMDj8XyUeDaKIDHvH2gsJPkC45u477cZjale/CTnnWhsS01q1sY/cUKuwwpIm6cfscxuIA0BlxBkbRTrtw8Dn0TQid7vVjSKsQCd+pibhWcf0XgZboXtgqz3cDCJMV7CD8zZKtz42sGeq6gf51a/OuZX6ERTWPAUkEGLhdz7Lsfesi0bfs9qZ00r8WgFZ2IbFW+axC0+neTOwFESbK/FkpmroaJhVpQxTIuszk4MOA9w0THvZ+sdCoXSt6vx5GUprBUiT7AQOpdD/PGF6wS+Jn0QQhjfTt/hENgiGRgxI3tQSjekVpaHmoF9U9pX2MJltWQrV2fnD7+tyXxgliON4vwiduf1U+BpKnU3+KQwq//rvPRCeG3z4YO8/smq3iuaKO/8yc3zBQCE6DhsPx+e6jmOP/QllUEjYRRpN0cKS1VCtw8mEOiG/0NmSm4np37vH7pJpC9PIya8V7P4zE9vSnL6Zro0GcbdLA3sHL5jssIELVfeBTM3ULx0gBvJHjNJa2jytFGTanz2Ut45PXEOW9DwJb1lbaNIqFo+gLuSu/PnACYeJo8CfJwQiISxqB/Eog6PF454HY5nSHWO3HE0bdm1IrkFRaH+HkVGC3OqhiFgTATrfH2Ic2AQpOGmZO7baFfeqct60Xi8zHcYfieEiVcEQXt9DFm4yW0y0afVPnLP8VMRSAA4s5ajuIgF3Cv7K5MUbAsqIvNzrWasodqfs7Xn7RI4JliNWDKq0KiiogFhsT8TGEqSTNENH2fAcmFFA+rF4Ujn6lKxtKLAm/qgQ13HZSJIB9KJnRRRX3xx7o8V8lQSdY1OJH9SwU41jSX04DDXue+cSw6kKffw0bIDw2KI453ScRj6jdJbDOq3ofVMi0GNiKeXrx3GyanzZhD4XZZu94ENI62HL90TWbfOFYppfG844zrnx/sg1lh0esqxk18Tc/czQolLv/kyo0uQWmXSyJsnHnP5xXIK5bVOH3AvMlku6fWsydhvD1uuqTV9RFkimSaF5j7d11VKXEZiuq4AoiJHMwMD4LZyz5FYvcBDAXoLaeGBco93L9bCRGt0XqQRWbOCFgc2YvD8WfxmtGIPVAkHFid7c9Sq3N9CY5P5iP6OFlsFkiMsYTGr4yey3evZ3/k7Xp7o5eO0pewjsjDrBDCPhkAprXETopAqXkrQ4kI/EjLMqjUrahPft5meTZOpIl9QTZOwzD0rsIH3HkP4N57mmelC3B4BZb8L6W8rrws6ZD50ckS2gjIU67vxFGTYW/idmliBvk3mFZxQc/XzdP9F12pzdzQjXC4KKpVFDURK4JBPNP30Q== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 51SSAv+IebtHsb9UjhUjkSByrB22UJonRZP0jq212y7Yq2aFsdl7ZMj9aYNzOqZCUalK9RPdaWCNNipfvqZtdlABs2tzf6CAC+3q4+JnV93ZL9UoG1rUk2j55uNuXF4SesMVen4pIoFNXb0miraU3Z6PNtrk9hcUKjOAsf27rCVpaMGH+/XbObXL4PDVY4Xh4ViA16H1OLqTpyQOn6XKVMq44+1ls4WFTx0w6qdCMtVMH8yDH9xXtoXiE4tJ1HeiJQmW2qnyb476VBhPy+yZAwdsioVkPJOxa4+cfcokS1SG2mYNM4R9ZP/EwZN51CJSMxNL2is7LfO2WenP1VM6IbmnfyTSFUgR3W7uoulV9ihXqRRN4CWG3hGH1Zm2W3lvZcyYIxk4o4qt6jPdr6Vhw/vaH3qol0HJ0s1B1F09mlaD9Y6o8fB3ACkU6sSlcTV/MvoeqgQgBa1tkRdMVRVVSTgXffkuxpqOz4FPg6u7FtcACBb6Xz6JCSevxQTxwYAxnAk1ZFGah5jIguJR0XTIU8FQLK9WHEGw05GDignjbYSqEzPMh5EOMlfQHQMTK4pusVySNLJ/lgOUVE+BveQltVgEI87Ta0fPHKKi1IPhtlc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c080f76c-0a11-4ddb-8551-08dd3f19f49b X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB7329.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 21:31:26.9316 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aQfTZIwPJn3arTSnA4EbNNSYeTk/FovP6ACN3uASJSoQb0fcizKkeqR0/6IhXAQ4TdEiED6Z7lbzbMOFh4fWJS+2oCQy6OxcazeRx/NqRO0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4614 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_10,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 adultscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501270169 X-Proofpoint-GUID: Nz9IXIjq9FuGQIXdpvaIDZ_Bkgiw10AF X-Proofpoint-ORIG-GUID: Nz9IXIjq9FuGQIXdpvaIDZ_Bkgiw10AF From: William Roche Repair poisoned memory location(s), calling ram_block_discard_range(): punching a hole in the backend file when necessary and regenerating a usable memory. If the kernel doesn't support the madvise calls used by this function and we are dealing with anonymous memory, fall back to remapping the location(s). Signed-off-by: William Roche Acked-by: David Hildenbrand --- system/physmem.c | 54 ++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 3dd2adde73..3dc10ae27b 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2167,6 +2167,23 @@ void qemu_ram_free(RAMBlock *block) } #ifndef _WIN32 +/* Simply remap the given VM memory location from start to start+length */ +static int qemu_ram_remap_mmap(RAMBlock *block, uint64_t start, size_t length) +{ + int flags, prot; + void *area; + void *host_startaddr = block->host + start; + + assert(block->fd < 0); + flags = MAP_FIXED | MAP_ANONYMOUS; + flags |= block->flags & RAM_SHARED ? MAP_SHARED : MAP_PRIVATE; + flags |= block->flags & RAM_NORESERVE ? MAP_NORESERVE : 0; + prot = PROT_READ; + prot |= block->flags & RAM_READONLY ? 0 : PROT_WRITE; + area = mmap(host_startaddr, length, prot, flags, -1, 0); + return area != host_startaddr ? -errno : 0; +} + /* * qemu_ram_remap - remap a single RAM page * @@ -2184,9 +2201,7 @@ void qemu_ram_remap(ram_addr_t addr) { RAMBlock *block; uint64_t offset; - int flags; - void *area, *vaddr; - int prot; + void *vaddr; size_t page_size; RAMBLOCK_FOREACH(block) { @@ -2201,25 +2216,20 @@ void qemu_ram_remap(ram_addr_t addr) ; } else if (xen_enabled()) { abort(); - } else { - flags = MAP_FIXED; - flags |= block->flags & RAM_SHARED ? - MAP_SHARED : MAP_PRIVATE; - flags |= block->flags & RAM_NORESERVE ? MAP_NORESERVE : 0; - prot = PROT_READ; - prot |= block->flags & RAM_READONLY ? 0 : PROT_WRITE; - if (block->fd >= 0) { - area = mmap(vaddr, page_size, prot, flags, block->fd, - offset + block->fd_offset); - } else { - flags |= MAP_ANONYMOUS; - area = mmap(vaddr, page_size, prot, flags, -1, 0); - } - if (area != vaddr) { - error_report("Could not remap RAM %s:%" PRIx64 "+%" PRIx64 - " +%zx", block->idstr, offset, - block->fd_offset, page_size); - exit(1); + if (ram_block_discard_range(block, offset, page_size) != 0) { + /* + * Fall back to using mmap() only for anonymous mapping, + * as if a backing file is associated we may not be able + * to recover the memory in all cases. + * So don't take the risk of using only mmap and fail now. + */ + if (block->fd >= 0 || + qemu_ram_remap_mmap(block, offset, page_size) != 0) { + error_report("Could not remap RAM %s:%" PRIx64 "+%" + PRIx64 " +%zx", block->idstr, offset, + block->fd_offset, page_size); + exit(1); + } } memory_try_enable_merging(vaddr, page_size); qemu_ram_setup_dump(vaddr, page_size); From patchwork Mon Jan 27 21:31:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=E2=80=9CWilliam_Roche?= X-Patchwork-Id: 13951725 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3088C1D86FB for ; Mon, 27 Jan 2025 21:31:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013505; cv=fail; b=hk/MvhGkUHMBschcqxI92vBG3dwdyiybXb5gRxJ09OStagr7lYHi+jUTjehPcXQIwkgi18+d5YR8RWyRfWpX7LyOXMmoHJ7JYVXfqGwJZvfJ0vG0qCJREg6uzNHRX/Shg3FoR5FqnkJiltLs31Iua16xqHfk736A+f0kCy+VGbo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013505; c=relaxed/simple; bh=jWyChtVMY2aUcbUP43wyEN9FbDpsyiR1yQHeWEX47TQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=iBLt7d7cWfws4gUHMD7FrNWh5IFs8pmVfs0wkQQZ3SvyyFQe42TRZC0K68UFuAKai09IbHM6phIrOiAlGZEYIokxOtgQV28iZRW1A9EOJ8EDti9eE/urUvLEpHp8s5ofYS3f9PHNMo33ZZcJoTIf+SgoV5tIcT02VCitKDTdJwU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=GLnDyqLw; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=0ES7RmbY; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="GLnDyqLw"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="0ES7RmbY" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50RL0ul9024705; Mon, 27 Jan 2025 21:31:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=y9szqM8+igS1V7zEBErk5drGmYfCdPNOM17CjVkyfmo=; b= GLnDyqLw8hbc+VUzmCpgR2XjgFtTgRlo3lSZ6BuUQ+EnOgQPyD18J2i6655s0sq7 QZ8jEUrbCGGjIFGdaqWenZM24WCHhCaJMMaeiDl3v5k77GaG+epFoL6aB7SsIfHW CqImSCvZfBH/YC/AYL3MqW6p7JuJCH8KeVErwZN0nJv1fjdfqdR7Iwik/iYRfWTx wZ1CxCAAxnA66ewJkmBFI/Aj6hN4zWpxy5ElSoRVnPQsw+uedRfU1Om6Y91p1dY4 lnVcf1xtq2dtiennclmYIbsrf0Q5wobY/DheLUsMdbs401NcsKPZ1TIELPc5OQ2q 8OEKKRmDTycw3HAY3NNSXw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ehpc8267-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:33 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 50RL9RhU005344; Mon, 27 Jan 2025 21:31:33 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2173.outbound.protection.outlook.com [104.47.56.173]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpd7k1dw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hJVvGYZR8HMup9jVOcTArBKSlAY7AvihTxMVkOVCf8zIBEFVirK/eoxloMURK4ALmb4fALvpZt97116i0BHxMJRpyt3IAQgvHwKPJT550XZWzw48k9AFRpyhWVeOTcS5o9iNeYgmGxXyCff1wZQ5AsIgcyPtheMVUYfBcjV1njlkv746zMA24SmkosY3K5voteJ2o1GEt/PaShs9Fmc93lSumFUCuAY/1TnKiotV0ZulIVDESVAUT4vwW9JcR2FmoXOed2e58Fr5Y41BlLMPdBU474BPRTN1Li1oMuUyUqqj+ywW1goEpt4BUl95csaY3vKOxumSD4i8eHkzCuad+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=y9szqM8+igS1V7zEBErk5drGmYfCdPNOM17CjVkyfmo=; b=quSmU2WtKUltC4GKzLnIkHYhc+UKYr9zDd6S8gHu66e82QyLSFgwKswBl3HiIxVae+sLUWWjUlVvHYdjCNWobtsKcYjAKQ2c/8pOqacAHsO+9KU8GBo5uJoHIQX/EwkrmBXxob/4KbfaVmtiTQT8Y1bTtKncbfC4vSj7MDxCpvCAWqc0+t4c7uj7/Zzts19WZdciNwdGbUNBy9wtUVFEyZTwD+dj5/67h9CipZH9I+XOtRhOLlSjzVZZSUOSqlpMxRk8n+mK69nLvbAK3QCTGnuOgMO0DzoGZ6TY3W04yg/5LrobHwVI93N2Tx0pdTdaSwB5RyPCZ1MZ3PzjsQLSXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y9szqM8+igS1V7zEBErk5drGmYfCdPNOM17CjVkyfmo=; b=0ES7RmbYq3Jyqs1t41ZYS10EKhC9jQqqcwQ+MmzruDQvhLtO1IeybM52LEgrcDfZLjllsjBEni8jFFi+nK7J+l445ly9hIfmfYPhzefXiH9gt+OacciDK2G9mfvENlz0P/4I9gpPLEEhTthIDQjBZUugHUKo6QApN5ePxF+/rG4= Received: from CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) by PH0PR10MB4614.namprd10.prod.outlook.com (2603:10b6:510:42::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.23; Mon, 27 Jan 2025 21:31:29 +0000 Received: from CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23]) by CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23%6]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 21:31:29 +0000 From: =?utf-8?q?=E2=80=9CWilliam_Roche?= To: david@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: william.roche@oracle.com, peterx@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, mtosatti@redhat.com, imammedo@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, zhao1.liu@intel.com, joao.m.martins@oracle.com Subject: [PATCH v6 3/6] accel/kvm: Report the loss of a large memory page Date: Mon, 27 Jan 2025 21:31:04 +0000 Message-ID: <20250127213107.3454680-4-william.roche@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250127213107.3454680-1-william.roche@oracle.com> References: <20250127213107.3454680-1-william.roche@oracle.com> X-ClientProxiedBy: LO4P123CA0695.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:37b::20) To CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR10MB7329:EE_|PH0PR10MB4614:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f9f93b0-f708-4c6d-e0a5-08dd3f19f653 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: M21H39vUfYSLi2+IzqWxU7e7dnZAkiIJsWDuJKtZddFcTPCTHDrvnn92BAGmlSmEF1uYGFjtdcsqqQ4QQYBeLyV+3HBrJuht6S2XblHp7kqSTSXZPJQPboPH0rTbFi9Y0/32RlGLqdaA0+r4Uawa+EOHNo+n+zjp0vyqHcZPNIxl2aIHFsGepiZbDpM33vNR86odrowD8iDmEpZA+4v8qtNY3G3aq0MP5uNR72CGSZxr9xrTjpZM5N8XK2FlUpeNOnzEbfNZU9lk8jxE70rf+l9hZ0ebJ1Nn6ST/RwvXFDTGHh/eEKindfvLbXHyBixHalr0m6KSnI3Q9nD9wQnZhAviNNyC1FJ6/spHnIvQ7a76QevQZpJpNtusE64JkF8Ly2FUfPYJ2e+8F8XNkxuA8JPki+lpTjIr9bJ8ubG5S0mNI55iEhAfbZkPHY88VwVgkP/TGUVqiM8DA5OKdD5nbv1ZUWywvRpnAhuwz+0jYh7IBOuAmBa2LX5DTl0zGbbab1FdxO0qExr4FWWytteVoSdg7GvPahCTW6d9JyAxzPYWiXmK9YkdnzaAzfQHsdgQtoyP5lIHZyp+1KJ422h/i4NQHEwEG7o0l+u3CXEUZNYxqS/wMraIprWS0tSINQDjjHL50Pe3b3JF9EzAiT8CQiLpefKWv7woBjPcOt3cgfT5lmPfITPJJmhNXtjbCNv82wrSy1z3Diasad2R3VRBTG+tRXwXIF83Q6cBe25B6xMXmgFWdIv0krczhp5zYckVcWN3fWO4y2qMcdzBCZOUZ8Iiu5+KjSkv+d8BNEurREd56XsKLpqxw82yq978K3f2UhKrqjLllVLufls/qrQ9+gUleKnuKfHuVpEcNWy6r86rQcpSO8d9CTuIn7viWXXPrOnhNJ7q5Oc8Soe05ZllGt269p/YdHyDtrBSvJ9QIqJlG8KHraEDQwHu7gTmekTSFDJv8f4MhuKXmDkENxbOcHthFcCDXbIS4qXLF+Dl8TkzyX6K0SZ40Wup0yBhnr1ok5NVQOK0zoVwl91zHkkKbA/zCiejR4eckIKhUAuXxyD+Grh/+buo9kfqVYePE9GKa8Wx70ESEeAVftrAgTqoqUITfk14MyAVz9mx3DIP6rOwa0b8wl5Q0iynPOTu9PdqrSbu/mUkpyIg1d08Uj0LdQtzteOA++J/Vt00jzpRGRvP0GgHNqqC5kh8lJduveIMw9k1M+ojEVNsEonfz49ahDnFjcXBIh1McBbZYZ2TfzRkUCqf/spXJD1XZ8kJXsx+CWHgLAEanPHv5TGVH7Hmip/H0ADc4pIJitIU2PPrm13UDXwT8xIaHZURorzdTH8Ph+WJil+5VOOSWHGtluc/YDsAHfuMNzxaZGmyy1kDzRewv852YaWpEfzjnN1rWa+t X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR10MB7329.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MXt/IfGXF5qsUPZIHKQRbVH5p6aOvz+sdUv5Z1OGuhUJKw7u/PdFcGxbU/3/WXHFRTQp9/9czVJE9WeTIiLxN+MPbNHAQHmtSk7lJ2onLmwF8wmC94ht8nSCkq/sygxozprX8p1RX2m1WsrukbXT71kIlG6veNN/GNS+3FqNYxgs06QRgFjT7i8S8DvuA75D3n27v5M3T07ZSiHekGL4TE6HYnnjW8z9RbLtZ1C6a1XX0NAyyOSzef0YIbb+TzKYJZKQQMQ3POM39hWRAxRh41y22F0d+Otqy0vKmNvKvOUKKfJlNz1X2a32KqjEXsfcOpX7O+QwGaH8RV7ItCeRP6HZXaUiIc/axfE0SWnXuQdb3FfvKD/VVGZmZ3q6pS2J/o73DQ7s9B5pki7P/2KqRyFUIssjYrdNqgoTPFT0SEpkwp/x9iE1uhcjiydyBWdMw259fWI9avvUF4i4xb8/6deZyFP7+K/uW2HfJnIEGML6iosjLApNMYT3FxxS/h43qiC0LDTuON1GfzVAj+lcmLXUgAwMJmicqy/PDT6MyQ7mYYqYR8hhW8zRD5WUEYZ9v9OmxBZ2OpR49qAA7YU0YV/+aG17w4bRr8XmTPOdI2FrXPr/5uT8u3cIQ3UAzbqBhNIJEjMNOudiyCpMa8UKHloEPdn5Y4cpe1VR/lb3AP24CaeeDyRnecrjb5VC1r4ai5SqDGxSWz3A5K2viS5FrWyNNkU/96VMBDJ5uiRVrvzTHf2rSP3o4tZJCQD9RyWnl7+kUmBTGSDCJEXi/SBUeuwL5B4KbYvY9fghfAzW2FzLYrsA5Njw8hovlER1sPpwUi4dqjpiSKhdKyH/OW1fcH2K000Zx9q8z5aS/ajTZBL5A5E8IBiUYK1mI9ePAUDfkQLkjD632/YTZskpunZ+XsBFz6f1tBk3o86KSwGU51GrITwCKOtzzjdK3PUC9WPOOivAEVqO105wBuXGjCWI5KUrZiIbHTbCNXvernmZL+DN4bh9mvxH95HK+wp8jaG94onyg4YswvXmafUqoy1jd4V1PdPCIcUo+DyfYf+LN52PM4Ow9gxmuj3ke59VxYAvakX2lzb2HN8OuO+CaQqYKM/BmFDwsVwElOdP2AQOqA2v+h5FyBr21FVmEi5LCJczhN2Op0REKY252AgpRUzbia/XUFvu2Br2AtUVC1IM0X+akf/7Uz6E5J7GInIQYC/U58pmMnhfC5IG6Rm8gcN5kx6sk0W794d6o9FqzhgCbw9qVFDKPIOZkmL47d5mCuZTZaYgLcjcIdwvDumU+SyvpcWgXpjCjasgSuWAq8p7n7NHQhJn+ynXEBgWptcY2wmAZ6Rs6spMzbfqtwlCwoueO1omw+nDIqb/9wMdDQEjNZlBmkJ33YtQ6jwsbLBuDqymE+A9vLLNFGGQrIVVB1geERJTvC6m9Ykd3UAh5yjuqQqQMk3YjNJjEBTyBBn8AqAyfql+HRlajo3XQ46G341N4ojM5HgSOzA9bmjrGzp8WUg95t5vvx3DOAQ9NpefiZi//zuH0+wsulDwQl2E21OyQYRlUeA338ZQ+IMTBrf/IriCkxZMNYvYdrFD8GI75Qj/j2f8Ezno+rll9uTLghIUcQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: uFzsD1n4FJjEIJadVMwpmvZP+2BR5xcau2BC+F2GsXiykMRinE2nJdbUadG3A/HnUMCBb9vgqqxelAR+qRrNd4zuHpcaS+MEiIAZxUOeZwhrR3dabcW3Ia4AZzL7yzjKUTgBJhGLf0zZQx/xw5YODAjeLiIIYWVm37imLs/HascQ4Z/xFmoMMsRpeE180KSc4irMJ7taCM6vxBgGaftL++teFKjGWEGa5AfrgMNzK1cZkphCac1yAZ4gwxnKzZfM9IGCdvsqb+6fLlGTcSG3CYBzjqytESor1hylBfbg5KgjsGpGp6ieU3uAbClXAxn8ywiuzTH2KItLurQOlMDaiEYr6N4rCWg9dldC0RlI0s+kgBcSgp5MUU8GiZKMcVmlQzNGau7u5HpIJbgSUSVQ4x6/VyluarV80CtZGHv/e0QZA2Byms5lz17H+9BZNuUow72x+mcVMtDMFQKuGs9uPzzBuTP3/qIqYUSfFqLRBuMTn0yR+DYnrYqPIsUR0XGjpbxdJs+rgRVRTXMRfHeDEBlrErbd46RUb7ysKHULq/WWQHE10V9swDO+B0lnsalfzd2ICbELw1rhSgd+yDZcxbCTfxrGkFd+9RjBvW3qdd4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f9f93b0-f708-4c6d-e0a5-08dd3f19f653 X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB7329.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 21:31:29.7918 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 72tzTSEaVInRSJp5nUGiRAKmTOoFsWIHVKCb9EDJRgAtyZyVWeGdun1WlBywG0mJoqVw+2YRthFs7WoinP+p94xq3Pq1KnOi5dlOgHWTm5k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4614 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_10,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501270169 X-Proofpoint-GUID: EBa8Mw1YP8K0_H3A2q_zph53PEeLblr0 X-Proofpoint-ORIG-GUID: EBa8Mw1YP8K0_H3A2q_zph53PEeLblr0 From: William Roche In case of a large page impacted by a memory error, provide an information about the impacted large page before the memory error injection message. This message would also appear on ras enabled ARM platforms, with the introduction of an x86 similar error injection message. In the case of a large page impacted, we now report: Memory Error on large page from :
+ + Signed-off-by: William Roche --- accel/kvm/kvm-all.c | 11 +++++++++++ include/exec/cpu-common.h | 9 +++++++++ system/physmem.c | 21 +++++++++++++++++++++ target/arm/kvm.c | 3 +++ 4 files changed, 44 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f89568bfa3..08e14f8960 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1296,6 +1296,17 @@ static void kvm_unpoison_all(void *param) void kvm_hwpoison_page_add(ram_addr_t ram_addr) { HWPoisonPage *page; + struct RAMBlockInfo rb_info; + + if (qemu_ram_block_location_info_from_addr(ram_addr, &rb_info)) { + size_t ps = rb_info.page_size; + if (ps > TARGET_PAGE_SIZE) { + uint64_t offset = ram_addr - rb_info.offset; + error_report("Memory Error on large page from %s:%" PRIx64 + "+%" PRIx64 " +%zx", rb_info.idstr, + QEMU_ALIGN_DOWN(offset, ps), rb_info.fd_offset, ps); + } + } QLIST_FOREACH(page, &hwpoison_page_list, list) { if (page->ram_addr == ram_addr) { diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 3771b2130c..176537fd80 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -110,6 +110,15 @@ int qemu_ram_get_fd(RAMBlock *rb); size_t qemu_ram_pagesize(RAMBlock *block); size_t qemu_ram_pagesize_largest(void); +struct RAMBlockInfo { + char idstr[256]; + ram_addr_t offset; + uint64_t fd_offset; + size_t page_size; +}; +bool qemu_ram_block_location_info_from_addr(ram_addr_t ram_addr, + struct RAMBlockInfo *block); + /** * cpu_address_space_init: * @cpu: CPU to add this address space to diff --git a/system/physmem.c b/system/physmem.c index 3dc10ae27b..c835fef26b 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -1678,6 +1678,27 @@ size_t qemu_ram_pagesize_largest(void) return largest; } +/* Copy RAMBlock information associated to the given ram_addr location */ +bool qemu_ram_block_location_info_from_addr(ram_addr_t ram_addr, + struct RAMBlockInfo *b_info) +{ + RAMBlock *rb; + + assert(b_info); + + RCU_READ_LOCK_GUARD(); + rb = qemu_get_ram_block(ram_addr); + if (!rb) { + return false; + } + + pstrcat(b_info->idstr, sizeof(b_info->idstr), rb->idstr); + b_info->offset = rb->offset; + b_info->fd_offset = rb->fd_offset; + b_info->page_size = rb->page_size; + return true; +} + static int memory_try_enable_merging(void *addr, size_t len) { if (!machine_mem_merge(current_machine)) { diff --git a/target/arm/kvm.c b/target/arm/kvm.c index da30bdbb23..d9dedc6d74 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2389,6 +2389,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) kvm_cpu_synchronize_state(c); if (!acpi_ghes_memory_errors(ACPI_HEST_SRC_ID_SEA, paddr)) { kvm_inject_arm_sea(c); + error_report("Guest Memory Error at QEMU addr %p and " + "GUEST addr 0x%" HWADDR_PRIx " of type %s injected", + addr, paddr, "BUS_MCEERR_AR"); } else { error_report("failed to record the error"); abort(); From patchwork Mon Jan 27 21:31:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=E2=80=9CWilliam_Roche?= X-Patchwork-Id: 13951726 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDBD41A76D4 for ; Mon, 27 Jan 2025 21:31:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013510; cv=fail; b=rKn3y/ID9oCuUihStNz1gG8T8U9ufxYQ91G0uKfFrgNYL4kxE35+k0l85Z3sJmTq90LbQIJQDvcwv8A9AitXPVeog2RJ001BfXaqnN6nZ3OT8pSnpkz720UROrz0jnKc25VCInZib6F+Dw+Y0rdifTHPOnN7rHV9buvTbmDbOb8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013510; c=relaxed/simple; bh=20Tc5UauRILAEb791eaLbNg/icLORwZCVsyQwEa3xe4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=BUFMqH/eKwuC/noFjTLyGe9AWs7oy6XiWbfwsvi7PtdbE375X+3TUUPRIxzyYKF3MWe1MG7gNwmmq9BSKBE/WddbISQx4V5jbZqbaBKAoAzRitfS2k61xtmMduGKlLhDZprddeEVi+ZnZYFW8NYGGs7jy6DmJWSV68qcZSbrYuM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=ajYOtAIy; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=oZru6MoH; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="ajYOtAIy"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="oZru6MoH" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50RL13Te025087; Mon, 27 Jan 2025 21:31:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=5XDCXlkgBm/NGnAQC6dIDVKtaeoq+xZCnX0nulNyL/Y=; b= ajYOtAIynxuIhPT8m0EKquQS36D4ijOkH0JSeU+2fh8ieStkBCv6g6Zqw3rUtnLK 4gOWJjTrI1i5dBicn3oVJHDOjwChiZm9tz1EM0U1K5WvV26xMdK+SYOaC0O+LTR6 C1oRt/KYN9ESJzxU2AWrXaO9h7Te/21PftLIM4vyjkFqa0uChZlHUXfUZgt5+twj eVNy0CTXVtGWfgNiA891TMS1wvmRzqRhy6YPeWgEzVGM9UtYeWgb3+nSzivyufC9 DlayR8skjBrevy7KyaLcJoGN/8qsGVHvVcuD7Cjcb65J3iY+W211ytsHHhsBsOVu H/FFBc5rWU889Gm/MheMnQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ehpc826f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:35 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 50RJta23005676; Mon, 27 Jan 2025 21:31:35 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2177.outbound.protection.outlook.com [104.47.56.177]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpd7k1fq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vch0KDJk/yfPjBqztHMDXROsvyg5qv9BmJiWVQfoKsb94uCovOO94jOqvmTmBWz9WV5BcCHU6Hm/WITOhqCrjGnCP0KK2jkQtxpsZQ40+gsZsn5F0R87877XyQ7mWpUR+i3GWq34s1jSdV15MR45fAtBVVBHbZCm1lq0CZsPxR7s3/o2jh5wxVtoZz4VhfiKwXeGv3MnSpnMJ/ZZZyIcHf3xZAbdo/NsNxgz51DkonyJsM7QgUs1QuT0TYe3aAYO+PQmXD281Igw/YlfJb5/ueJQ4T+3Iig+a9i5NzKzo68PLr+e9pbv1gcgJdPW9AUWkpLKM/OpejyxUXheirqjzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5XDCXlkgBm/NGnAQC6dIDVKtaeoq+xZCnX0nulNyL/Y=; b=X6K5iil20GX0iVDE3eJpJhpOjrwr2fl3mTIMi02lifmDu+FWN3zSsdrVkjuFmVI55fcpsfcWVZvs/tVIyesXOzutFooK8wzOs+WkkJQMzgtCY6uMBScXgd836gETzyflKIb51dIXBJ/NKy+XW+X+NR1+zzB8RzYhNlIomH4EOvpGAnUbe8TLmsYaitkph4ZR/L9dSN95WWTunsyIlI2LYsVy5TQCmDvYk+geKhozotA4kaF6oNbHOyq5jriqPohzNnxYN9ZFzdI2lqcB7+dXkQt2iEZa1FHV6OLSPZz4r3egI5n4FAHYjiL6j7TmMFUjWwApPD1mB8fVNyzh0BtfCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5XDCXlkgBm/NGnAQC6dIDVKtaeoq+xZCnX0nulNyL/Y=; b=oZru6MoHCQ0sPlloC77TAMHP5x/wQclCyVdECIBA1MU1mddEKAJuMYHgKnrtYzMUCWmqzBePPm8o+gp7sT/IFXFkG09fMo5I3Ka6BuerzEcl0YdnI3RIQP2nC0CI30Dz89lX7mKUDbpsdQ1Omi5XlEXp/Ehj1u2Wrnyd3YBd5kk= Received: from CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) by PH0PR10MB4614.namprd10.prod.outlook.com (2603:10b6:510:42::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.23; Mon, 27 Jan 2025 21:31:32 +0000 Received: from CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23]) by CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23%6]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 21:31:32 +0000 From: =?utf-8?q?=E2=80=9CWilliam_Roche?= To: david@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: william.roche@oracle.com, peterx@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, mtosatti@redhat.com, imammedo@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, zhao1.liu@intel.com, joao.m.martins@oracle.com Subject: [PATCH v6 4/6] numa: Introduce and use ram_block_notify_remap() Date: Mon, 27 Jan 2025 21:31:05 +0000 Message-ID: <20250127213107.3454680-5-william.roche@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250127213107.3454680-1-william.roche@oracle.com> References: <20250127213107.3454680-1-william.roche@oracle.com> X-ClientProxiedBy: LO4P265CA0233.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:315::19) To CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR10MB7329:EE_|PH0PR10MB4614:EE_ X-MS-Office365-Filtering-Correlation-Id: 06d26ade-78e0-4783-59a2-08dd3f19f81d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|7053199007; X-Microsoft-Antispam-Message-Info: pFCNRE0neXEdoHq9PelYNlbdIvIezXeNw7B/imHe3I0rI0inojkSJDHwS0sS8zYqS3/4+VSIYVymaFNo8IEvT1kcPpJVye8pSmh9S+nNZjqTQv34SMszFtqt3aP+Ml6sMiPQwaXf0mUD/1PVwyFGtleudYsa5QsA5EyK/TsL1A0Vq6p63rzyUu963Bs8CDiTPRvPMgN9GC4e97OB2+iDRYUMa/jPI6AFIpWp3ldoZV1P5/Nf4FB0JvZ7P9QqloL8reEuNfFw8T7T3775Fa5tksEs8K+Zj2oR+k0qOCmjuQ2wQdI3lN3dhzGG+tzdvFdK7rmtJa8TFFp1Isiz/S/xDDksNXp0wm5s5wJvO1ecZNqB+tudjil31SQlYCX1zW2Kf1bHHpi9L6Ejy6Wz5gAaeo8PnZOP1HqBM5reJllDHwuc806cCGEk3B+jpTChV5eBcFvjVzTFW/AX9L6TbbN9IXd6Ng3FHmW0LvLFEWsutAYwJJlXdfhUoViaZX+z7X6k9K6YI26FnD4/v8H0jOYMXtXuRL8U88IrhkKKtBlU/xD7roqF15VcubZAO5Qv5xbenu/qdIxhL3eg+eoa6JJJlOsUocHBxRocM4Jzhe0JjEgm4hGH7IYL/iCASHSPDPagICK6/Ty+biRhEk6q8uD/rmSqbMgLcycpX9JrhnnsQRwEa/TMMcRvUfw+tOT/g0YLttc/8tX+hT8VPk4Lw+ZPbJcZmTekHZtYiwpxGqZusZYSfpOtCU4MUxj3HKph+6bOBzFpdswMcTPjTTx3rqCgdl5iXeOdbKLNMkHHyzEHXYUUFrrPZuHdhIIIuQif8hwrX2A7wz9foNpLl9RPYInNe9e+ZWdbY237oKvQ9mFE8I7xfpbmEWKXo23+urpzTFTlNUYinvvDlKlua7dAUGy00Lg3/a1kseKf3CquOK9yxwK6ebR4MJYzZFipBtXANKaHQviqatHGpQVUvxVbO6SouQZGxPhRpCcpmisgtIEflgXlTVT4UYwexK+nzMJe0pohU3LIragwS8JJZXTd7e6C4utxLidaDnLCFNP3Fd7nt6ztqI1nhJtgrkikldX+7MOO0GGEwTeWNOejs3QfiWEo68tvlAMMmCk136V/arSJ9q9+liC/SSIm3lC/NMyzpZEcUfokAoPx2sWx99C7iuiL70VGe/4S2xfdNXGEGlmGYGgMOCJ7Fgy0vTILiriKO1VrlVwo0w3N7uqV2JuQIuof4IyJW3Ce3C3EVPz377UnTANU0TTv1AW6mCjQzRvSBDmt3oGRipuMMVxQL/o6RUBgwLHbr7qNxmZQ+THrzScG/0L72u2Y6yt/8v8AE6PHtJkjRE04t+HsQmU0WKtgF976+f/lAdYC6haqrSdvDjsPcPdLhk4n4cBIPRbRlV+dKfx7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR10MB7329.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cvcy1Gjtr3gYbIRGwssv0q5JhZ6V4QZDHxl6i1Q/0hl00SeMbJeYG144gqYGMLntC/S7iVvnUAHjWQEG72sTmvd+WnMmAPHYyOPbqNP5CU1XANRoOVOkLfgcPkGXVdu9Rc1LnkdeF2b+TPBnFZ2013MA4Hel5N1kdxX86447jS9tMB387jswzeA33qBxF6ne3HfXRhXlO6SZWGCrVAIHAKtfJEwhfnlzN9ZyqNcoZE3J63bthRUlZz8JeoMMKZexohJEdliw6EvfWeC1Nf386p3I48WTXSaKCs9pf/YwCr6BOD1EJOt0H4obdrN20pY0X9QoXouN0Qja4Icf792F0xVkxlT1LEW8ere2ufXZEhmmdJYyAmiE/GLDx+y4gyOLkonMINhY712CW/2AL2AXMPp+svY1cjohzmoT5SOk3Ge6fhUnKX+bcjWynf8KDSSPA1FMO6KqP6XZ4MDCVqV07stz309sfazLlXahDG/GEdFA2NwRzIpVYtJ1wKexnAr7DIf/EnsvKU9deIxFmLy7XFOKzbhxx9GIYx06Ce3NpqfUYJKWN90YaEfPXAn3nTnN/1i5jm5q+8DTZuoETcvlOSYAQUtPt8m0EL43T/GGZl6kPo9USBDcYMRGj7Dc4I16bPV6xGP5lcFXkeKXHHxZk+STLKf7YsU9JQajIl0rqvRcDEX3N6wWJSjU5uGD8J6XPYO6Yw47HMaECAduHe8FViFY+C/nxTinsgNCB24SPvSSfu2JYBpDq/ZCSy2kOGTEGfYM16WdQwrAopv2gO3pyLxS/0GLmVldCwjdO1/6udhVAuzYMhauaa1YesTogf+mtcQettOXCBewo4LK73lcPIc2XIA9Luky39M3Q/A/3MTHYcPkMAxaOnT256b+iJutB1zXFp5Afsxx+giNY3/NMw+Aq66FMQnv5S4TVN+dG1Qq30slTtqYukTLkevBe3TQulGy6dAK2GH67W3u4iMSV3Ajy0rMSAk7VX+EyOO0pQW81dAmgI01FUabxK03leng2S/mFue+8TfCqQ3JLdQVTkxdkuZ6g6y1a+3bQ5TKORrfTZfvHk5gR6lDiFAADvtQKsNZRwErolKAzFFTIWjaJOJN1tan96di/VPDj+WqYGG30Pxl8uySUPj4RcUkzLhAkbbQ/iNpgfGnfddo7hvvusHRH/RiLrUUThHocYY7ejQerQSeVwtCgpi4qyb31xmaTGAFOQmfY8UVRjzTL1fnBOJacMQg8zpL2BX/n63vrWwk/j8aKVRCw6io2zgKmGKPk9gXmCsvRrn2ZzlIiMij51Vt2l53KdNReOd3DNMFHi94/GsLZ35jhXJyjbTe69JYzHBAddDZbqWLB1TaXHtHwE3i4n7IMNlN085OKSaYQMemYr3TsWGmMIdJQ4bNlEuCRXdsX+iWvq6EtjcmbFVpvrIv96dXu1KCnErWcGaNkVl6AUufOlGGj74jr1xiaAFYhvSPu4y71THjBy2xiHzU3FSp6noejL1wdmMsBl69TJCKo5Zf+MQru2iP+yIo+KkU0w3b0SSZ7Xfl4LNbrAgCwdFLE+ixbgzE6Y01B63A7UH1FEjcfMsljThnbfree9QVl4AhX6z9agRC6WN83QtEDA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: bUsNrRjExdD58hjXUjLAYW+zOXhmn/3aSVDRr/I9UEgfvS1HNqSMuWEygTdGyIpTe+Jdxe7SzoHqCjFN0qOka+tBH3tAOTgfyA5fjNh43yVBEFkq5ZMuV5i3ALMhnfYFhhnAwXHrcRuMoClMQ3lSyvtajxVDknQsHHSvskpzD+nMvQG+0OEyCaidSvHYKSqE27JILqv7Llaai6kr6tdcdHsrOB0dZJ/TlKRYFkRGP3iTikPy9OePYt6CKgeksLyNAc/ISdT0MPTdwKzb8cz53rpn6wQ1gcFqLUnh39NZIZ4sTLJI4jPqcnh40zJI1tLO37z9PVm/ZZx9HpwzfYH5OaJ3cIJpp+qhCKt/QS0Fn6Sztr5gHnHMeDO+2NjZUuuVp62bL+4+KlcPoVbChWiLdb1gTBA0u9RcUmg5SgKElvEUgVNa8p3ZuW9+gzLDnK+tssN2UVO2vLru0SDvhz29LzgGkb1UiWQEU/9eb2HnHFjwGM0wVYd1eFIkjG1WKdjisSyAWCWsh0WCzg2eINph7Z3Wu/zlqv0WnLfxERpXqHjWBp0LF3RXZ4dlKM10O9+VKC3T/8kJ84uO7B73reoWZkzbfljrdKZXJDxcYIkAE+U= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06d26ade-78e0-4783-59a2-08dd3f19f81d X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB7329.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 21:31:32.7297 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: P4hTh4X9I4XX99SMRU6WyLwfuE9e5ifsIQTLmS14JV3wrk+Rqtq/5QKEMwM/qvaAkK7pG9QTftA1c0mW7t4/4PDZ080SvVTrw/921UonTU8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4614 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_10,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501270169 X-Proofpoint-GUID: NGYsoCr31AVAhYDZ41BzQYfZGARFYya- X-Proofpoint-ORIG-GUID: NGYsoCr31AVAhYDZ41BzQYfZGARFYya- From: David Hildenbrand Notify registered listeners about the remap at the end of qemu_ram_remap() so e.g., a memory backend can re-apply its settings correctly. Signed-off-by: David Hildenbrand Signed-off-by: William Roche --- hw/core/numa.c | 11 +++++++++++ include/exec/ramlist.h | 3 +++ system/physmem.c | 1 + 3 files changed, 15 insertions(+) diff --git a/hw/core/numa.c b/hw/core/numa.c index 218576f745..003bcd8a66 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -895,3 +895,14 @@ void ram_block_notify_resize(void *host, size_t old_size, size_t new_size) } } } + +void ram_block_notify_remap(void *host, size_t offset, size_t size) +{ + RAMBlockNotifier *notifier; + + QLIST_FOREACH(notifier, &ram_list.ramblock_notifiers, next) { + if (notifier->ram_block_remapped) { + notifier->ram_block_remapped(notifier, host, offset, size); + } + } +} diff --git a/include/exec/ramlist.h b/include/exec/ramlist.h index d9cfe530be..c1dc785a57 100644 --- a/include/exec/ramlist.h +++ b/include/exec/ramlist.h @@ -72,6 +72,8 @@ struct RAMBlockNotifier { size_t max_size); void (*ram_block_resized)(RAMBlockNotifier *n, void *host, size_t old_size, size_t new_size); + void (*ram_block_remapped)(RAMBlockNotifier *n, void *host, size_t offset, + size_t size); QLIST_ENTRY(RAMBlockNotifier) next; }; @@ -80,6 +82,7 @@ void ram_block_notifier_remove(RAMBlockNotifier *n); void ram_block_notify_add(void *host, size_t size, size_t max_size); void ram_block_notify_remove(void *host, size_t size, size_t max_size); void ram_block_notify_resize(void *host, size_t old_size, size_t new_size); +void ram_block_notify_remap(void *host, size_t offset, size_t size); GString *ram_block_format(void); diff --git a/system/physmem.c b/system/physmem.c index c835fef26b..146a78cce7 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2254,6 +2254,7 @@ void qemu_ram_remap(ram_addr_t addr) } memory_try_enable_merging(vaddr, page_size); qemu_ram_setup_dump(vaddr, page_size); + ram_block_notify_remap(block->host, offset, page_size); } break; From patchwork Mon Jan 27 21:31:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=E2=80=9CWilliam_Roche?= X-Patchwork-Id: 13951728 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC5B81D7E30 for ; Mon, 27 Jan 2025 21:31:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013516; cv=fail; b=Cs1UhzZRMp2+ivJsjBLRnHbeFBghSjmaQRtOF5KoGOIhUsUMtHFZ4vGMzR9MkaQTdsWpRyCA92cHl7bWXiZfZSqIzCUy8WwrH+z02TErh2PqWnUVoDW0xOkgtxLhIjjk/dg+q2c/TZfMCqnkirQpsbizfhp7qTLUVutEVu8A4is= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013516; c=relaxed/simple; bh=Wa17K96WHsG+UwDL7GtcB408PTs+VpOZQSc9ceuddZo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=TG+/ngkO6WowmuvrSh8pa+67TeDSGTbLCst/TQ/fdhDka+3rDpr2M4BJDDfPYGPVrPudwHFSXUcz4loXBCn12YBdesjGybhaxWKcGMk0ZgNEZv9+CpuT4GuE7ou5Qaz6fVrLMHR8Goh+Upzc+dDuD4PcZJzjNO/AhWiy1ecd3Ro= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=GZG3Nh2R; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=m3CXXKgu; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="GZG3Nh2R"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="m3CXXKgu" 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 50RLR3tQ015041; Mon, 27 Jan 2025 21:31:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=K+SxdrdX1InTxo5zQE56qa247cTBfeTJ3jhGnfvxBow=; b= GZG3Nh2RHzg6tHmzRWVAG4n23U4aUtgXsp+hECSkatVxp46KVmuzMv8fNkp5tnve E39cVhlujhpiQYCVaAD/rqSb2PnGWBIo6hk/xAPoCqgC35mEWYoY7px7qprBBPQ6 dNoYUj6vYaGRxGm8G0ZG35T2R55XDa7unHsNaYO0ozG3yGVKiJKWhKw9ley3fupo Bw1Bt+Tu5CGCSPnsH/hcqrFVcEzlN5fRmvmGhqHaOqUcBMWe7jUqf9OQKyki0tlt WcED09R4A5muqQRNfHJZx2woSQcvHNzEPglMNIM/ix1bNAvsbx5Yfij03jk3uu5t F02b4j0ck3aCOd+uIpzBUQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ej2j80ds-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:39 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 50RKSlri021979; Mon, 27 Jan 2025 21:31:38 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2175.outbound.protection.outlook.com [104.47.56.175]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpd7hsp5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uDNwyy19wEbMYLPmlJTZ1zEaCIeHU4jJZHhXdXuvupDKinggA+ll1ga0D44yA9ofx4rfqUsmi0aH0+Cr9Lw7SuD637MTW8Q9jN0l3nBZEUpE4Pan+VS7kYGnUHyuJT6QVJI5ao9Vl3rfKS/z03iAMgVJqq21nlnXd10m+/2vZN6fS4r9rdrfd8BQYgT1JHV4wByx3OFAUuhjbhoSVUH0Vkn+r/x8OAcjdBVds+7C0uFevsrIaV9uMs+E0RfFaGHIWfguWENeqkYeFhbj18+rS9ws4LwRzKPgIXv6PH1aPTyDUihc4KtFokPVyqimXVC14GH4v75SqEEyOO29mzBMUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K+SxdrdX1InTxo5zQE56qa247cTBfeTJ3jhGnfvxBow=; b=G40L8Co5qxr6DAFetL/imVD7Yjbyhp93eTjF9Dl6lwsClQVMUJSY/usPdxjeQJgT9Z4hKCD8Y6VhuLspy25ExSBDxFyHa27Vd8U40qzR6Q5Z00lqu8QUeyFU1wK4dNF1cUVKl2YKqW2YFmevwx/aIkDZcgePHQJLMwM4wAGVptBK/EEJbmi/MfFRYyrR2g/FiFtf4Re1pcuRyMDKOKP97Ilfk01W/nuXDZr6jFp6DOXjy46Ehrd1q507FCm/ua70pcvnSdF6lVU/h91bIoo9rccfwL2VQxHO1r+wo69JssID8Oj3OFRZhDDJVBkqjL/cMtIT+1bLZHkHRUTMUAVNeg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K+SxdrdX1InTxo5zQE56qa247cTBfeTJ3jhGnfvxBow=; b=m3CXXKguQK72i86RHUIOkFJpW81WwW5SBRzNX/GoYurbBWaRl66RPYmoDanYcOaJNpYHDHKwMOi2JzoaG1zAo+cQSEFNktNtS/UcDRvJPm7IN2pcGQNjNN7LBBqYdu16fnIPgQNThhnWR0w4DnDjagIklO4hq7SfzcUNkFDNVqI= Received: from CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) by PH0PR10MB4614.namprd10.prod.outlook.com (2603:10b6:510:42::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.23; Mon, 27 Jan 2025 21:31:36 +0000 Received: from CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23]) by CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23%6]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 21:31:36 +0000 From: =?utf-8?q?=E2=80=9CWilliam_Roche?= To: david@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: william.roche@oracle.com, peterx@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, mtosatti@redhat.com, imammedo@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, zhao1.liu@intel.com, joao.m.martins@oracle.com Subject: [PATCH v6 5/6] hostmem: Factor out applying settings Date: Mon, 27 Jan 2025 21:31:06 +0000 Message-ID: <20250127213107.3454680-6-william.roche@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250127213107.3454680-1-william.roche@oracle.com> References: <20250127213107.3454680-1-william.roche@oracle.com> X-ClientProxiedBy: LO6P123CA0014.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:338::17) To CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR10MB7329:EE_|PH0PR10MB4614:EE_ X-MS-Office365-Filtering-Correlation-Id: f92cf85a-65fd-49bc-5b42-08dd3f19fa23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|7053199007; X-Microsoft-Antispam-Message-Info: DYmrAqAiQrON74/04wLzNRiaxusdbbbHx3ZvkcqXBUh4+69o6satBDkgkOLmcyll5y23QxrcmCU8WAQDYCDKTD6jZay8V/8zhlJtaVwkKQb6CEZ1y+ouFwbYzXaGFg+3dnZ4Lh2+IWsimOZIBQDa6AhbN1/6PXA1+CAf67fKRaSfOuwgBIDBkFHvd0zAGBemTWswHZD5EYpB3SNwack2im3f8pYgrrY+AIQn3RlTmm6yr5/vFPyyOcFSXH9IL+wIP3YBe1xWvoRHXV8ygF2Zv0Rx2aWPP3iNaUIO0sENuyB8VWwSJ9X2g6wisqtEI10BM1V4AvmUOe3ZU1BHSGU/inyKtwzUpcL9C4sqnRY3Eh6B5E6atDnOqftvhlZc1xJjS5aIOwWiZoiplT2JRs9BlTm7Cx/PiY+AvfbT8DcP7iBQGTkjrDIEZ4fFGpeOnPURJJ60nnXrjM5csNYqZgylkGYG573N+a8J3qaLBkIdZWMncI77WkVfTA2YZhbuHVAzQ5m5f11ZWFroOR95mDLRQgtvOhSR9ldWfg9xCTkUn9mNXl6UUCmCdvBb5LKOnURsj8B3q4gb5LzcmHCxj2yyj1kF4f4LTwZEkE+0YwmmsT5cV1mivS5ONmx6tgZqCP49twbLAGhco5cAVueHLQA13Qi0LDhZpWiL/qHFbUSeOFFOLKnUPpPTWN2Y900l77bTnR43CL6uSGoIRhng7gS+Ts5M/7OOS7pD/SwZvy8tjN7QQPIOiGOFrwh8q2dKKf9UI7BwknciwexG5tdOjq3QtO+WFbjHC01SEkePVc455RsBKFm/9G5W4ej1rFQTHBUlihE9zmH/j6HH89dzcHXzimhBOQTTmT7keK1F0ZCjPmFh7Tfq5s7z+VqPTvAQvi/sKvuP+npKhx2n/GGUUw//JuXuACxTDjrSveHtxg9hCrVNVXapk10gZVksWqMfaSBqBgOhgXhrCIhzyWzU2rds9PgB3M5fLLonhUSPO1MXgjm+xTxMHhAVj/QsyyJIiA8NI5GX5/iX9c3bsILvz8aS9OVt89tkxdrpInHBANTYOWyg7ZAxWZ04m1pkmKJdd6jdR84R10Xqg3IX9QGBa2wsV2sTGsyFNZHSy/GP4+8EAmAnHkByo7mrw96Asr1RkiuZRsY8PkSCLP1Lbl6NroAkyACi0zFiQJhKlqRejMfzFj+C5oiF13167XjcQ9kykfeiWh0/VPVTqvR1b83cOrhuNlQIhq2q4JyYNtHIuxaX1ngnrzLHsGMngemYEuPewGbByFdYH1Le5nIr/kgiJhVis66c1F1cuaJjae5nHDToImNe7H7bZJrFL4ng0Aq21dlYIAIi21bvyP8D/nGfbfmhV1rs+5cDdGQPLHuhqb528y85h/bXc8e3dvZrShUOxMdF X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR10MB7329.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZUbC9YU0O2gCkFZ0CFLNfHvFKAi9gEb0haE5UL78mnhnPgaX+xSWTCv49YEcVuAzpkYTV1d4yIDRWvBlrVHumC1DRHQGYZGR/Tv3JpyLn+yB53ykkGoNEnWzngNJNoOL8N6l92GWA/rY1Ydb0l5EhrOjDTmJ9AlMUGQy5qJwqkoTHQk8/VKXvhhWMEITYq4wI5pGm5EVmkbFeG7XO1aX+fGZ9/CgtftGSg1fNez2WxIjNjKaN2hYSdMASuTa0W2WicnkJPRJgRVruIpICAsLZiuEC1U8icNwH88Fi+tLeYiyKa4w8nvda6+838agRodzVbVKX1hXc3HqcgqBdXy1NHGlcu2gnK/nwBQ6DuwHs2nviBWzKWg/Pe/qSNVp5jTeRc+eD2aLT4qHZoO2sDi0R0VmlPtVdqy7iDjulIWYZLQrBZdwm4nl5nd9DieL6iyLb5BwOgXmb2kTcoS2Lqbuoo2BwrjWVkjTg4QFclrF7QLII/TDRF5+7FdApHlUmBR+WqHAjU3un2HaYWIT99zooaH2GHsgYrQJRlcilZlgB9cCnXC3ifk298aFfpSdx/Kw3vF9gphWb86SEkM8xmOF9kzPP4kw/Vc94ToDGjZi1H1sYVLKz9l7Zx7nh0qJPcxLjQ6Tf6Ve1WDKFw/TqB0J3R/chEqXsCF+4fvLXulK7Q+ujgjoQSg0GFN9ptU6sts/YsXphllvnZB1iGtSS1WGgK3Hk+xP2r3Zy2KcEUbaj7J8uDBH1kffZdd6X0Sk2PalMYRlqbCzBH5qWREuv4E675Wqe2YF8Fo+r1Cr7qzGbKO1+0j0dAIEkGq4vQccOuSFqzKJ24J+1Nn3/R5igAfWpCBHrvA1yVAMPCHxKSCzGC39xlLSbWu3MpXdTbo5FnP3upDjlozENjwj7aSoHYf5U+8uMA1gcODlUP10ArxhIe5NF+pTGtt9i3L/t2re7ZBfU7FBKz/2ohgI9aa8WlwnFTt7Ziluyg02RcOBQQ/FKY1sRRejim9G1UXczSkncnQcAQY6S76GM+A5E4gzRw0YutqMRGCZ1PdyAGpR1cT+ZBgQUhcqUan7fFsJwEDvyMPdBg7rphuT0cPsVIA/YLSzbcZCuUUGZj+Cw9KRvCgTL4FZxsXcDWSJbH61mzTGVhzUZk4j7LU7BsN68mRH/LvxryjS6maqbeOw/ftw7RUkW1fUeCm53N4LHVJEnWDoRB6NyKLp5R6EWzH+uX7Pdyzc1Xieqy0lVX7q4YJWKSxQ0+UqYSTWT/KkKQwuFNAX0eRwXIe9Ys4xN2TH7dIBVl3vqQubbHOeeESPjoabf7QRCh146Td7Dl2KhmZgB2wlRDdWuI/hdK8GgBXR0kYlL/eM1EuCukJRkuQTARX0E5GgjTiAqQuI0SbZWSKiN29Iuekw50OPLZ1vmbtLudVExGV2zqhiSb1uGhzYgG+a4N0MiWAJ4bdvVbelcozEHGoTI/AyH77eSrzB9rltupSHwMFPRKJLxKV2V2zQD3qmxCBMFyAbKsP2qPYM7Kg9y8FsFynO7ytcPNkgjvpASpdKO90JikRFCJxw+pGvX4Iiqrj8hFccUMuieyjAzbCSWpKvvo1sDyBx7NZSHU9STvkWRO6WOg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: HQ5+aYjaA32W3cOR3kAsg3oz1D26gZZ0rZD/qXGUyyao6wmilY6VQTU2usqGuZ1K02DxDB6b7saWrszl4k+TATkP5Nvk7w8MVhPaVYIraOkZXIb2RTCpUt5Q+41w/WznKPh7lu/5gr8iJhK5koscT/lz1QS53a37553UWlzDxyFoOyvZXI19rUkHl4H5uVQhfl1mznw6WTUw8CAl5aAEs+ALGqcFbLL/35j3FYxDUjpf/fje3CHTbnb3mKIXMpCawhz/6G9kiEkHBkHwhwMWFsWsZFdNqffojhZicYIQj3j2qba2rFaz0ivtID0qXVCIk5hczcxzjzrSoi9iCNmeG+7pKJTuwN8+GrnMF1ZNkOA0jA58ySRiKOwrNIe3vhz7ejpHn3m38oCfOHJ0CaLf05qZK0ZaRnB4Xl9fkG5iNGMP5D7fx5vRKMbMCLH0gYjTdwBcw+Sy6TnpA8meY/lyAGVMdZ+cQMToUmJmrb4CY62pDZrxUEdWaRQpJL2Qi2aG5WZ5FcuBQtoDnkEwPjGZt9po9t8VPrsNtXGDkDrbL13UtjCatdtcdPzaYPYiBHGELeL2rPhUd0yJjTFH5H3ymBW1LDplM5yFD8VyvN6GrIg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f92cf85a-65fd-49bc-5b42-08dd3f19fa23 X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB7329.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 21:31:36.2265 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H5NX2DRDshRwyg2EumwgDfF/eiCw46PUW7fjsYTuIG+LHm63o+QC1IXXvwhmRFtJUAB75JhR9zShu9uv46W0lhLKnnmdMf/bL50KkUnNy9A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4614 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_10,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 mlxscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501270169 X-Proofpoint-GUID: gK5Ji-Pn0n4AL86-YuUZcoO3k4SvzgIm X-Proofpoint-ORIG-GUID: gK5Ji-Pn0n4AL86-YuUZcoO3k4SvzgIm From: David Hildenbrand We want to reuse the functionality when remapping RAM. Signed-off-by: David Hildenbrand Signed-off-by: William Roche --- backends/hostmem.c | 155 ++++++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 73 deletions(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index bceca1a8d9..46d80f98b4 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -36,6 +36,87 @@ QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_BIND != MPOL_BIND); QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_INTERLEAVE != MPOL_INTERLEAVE); #endif +static void host_memory_backend_apply_settings(HostMemoryBackend *backend, + void *ptr, uint64_t size, + Error **errp) +{ + bool async = !phase_check(PHASE_LATE_BACKENDS_CREATED); + + if (backend->merge) { + qemu_madvise(ptr, size, QEMU_MADV_MERGEABLE); + } + if (!backend->dump) { + qemu_madvise(ptr, size, QEMU_MADV_DONTDUMP); + } +#ifdef CONFIG_NUMA + unsigned long lastbit = find_last_bit(backend->host_nodes, MAX_NODES); + /* lastbit == MAX_NODES means maxnode = 0 */ + unsigned long maxnode = (lastbit + 1) % (MAX_NODES + 1); + /* + * Ensure policy won't be ignored in case memory is preallocated + * before mbind(). note: MPOL_MF_STRICT is ignored on hugepages so + * this doesn't catch hugepage case. + */ + unsigned flags = MPOL_MF_STRICT | MPOL_MF_MOVE; + int mode = backend->policy; + + /* + * Check for invalid host-nodes and policies and give more verbose + * error messages than mbind(). + */ + if (maxnode && backend->policy == MPOL_DEFAULT) { + error_setg(errp, "host-nodes must be empty for policy default," + " or you should explicitly specify a policy other" + " than default"); + return; + } else if (maxnode == 0 && backend->policy != MPOL_DEFAULT) { + error_setg(errp, "host-nodes must be set for policy %s", + HostMemPolicy_str(backend->policy)); + return; + } + + /* + * We can have up to MAX_NODES nodes, but we need to pass maxnode+1 + * as argument to mbind() due to an old Linux bug (feature?) which + * cuts off the last specified node. This means backend->host_nodes + * must have MAX_NODES+1 bits available. + */ + assert(sizeof(backend->host_nodes) >= + BITS_TO_LONGS(MAX_NODES + 1) * sizeof(unsigned long)); + assert(maxnode <= MAX_NODES); + +#ifdef HAVE_NUMA_HAS_PREFERRED_MANY + if (mode == MPOL_PREFERRED && numa_has_preferred_many() > 0) { + /* + * Replace with MPOL_PREFERRED_MANY otherwise the mbind() below + * silently picks the first node. + */ + mode = MPOL_PREFERRED_MANY; + } +#endif + + if (maxnode && + mbind(ptr, size, mode, backend->host_nodes, maxnode + 1, flags)) { + if (backend->policy != MPOL_DEFAULT || errno != ENOSYS) { + error_setg_errno(errp, errno, + "cannot bind memory to host NUMA nodes"); + return; + } + } +#endif + /* + * Preallocate memory after the NUMA policy has been instantiated. + * This is necessary to guarantee memory is allocated with + * specified NUMA policy in place. + */ + if (backend->prealloc && + !qemu_prealloc_mem(memory_region_get_fd(&backend->mr), + ptr, size, backend->prealloc_threads, + backend->prealloc_context, async, errp)) { + return; + } +} + char * host_memory_backend_get_name(HostMemoryBackend *backend) { @@ -337,7 +418,6 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) void *ptr; uint64_t sz; size_t pagesize; - bool async = !phase_check(PHASE_LATE_BACKENDS_CREATED); if (!bc->alloc) { return; @@ -357,78 +437,7 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) return; } - if (backend->merge) { - qemu_madvise(ptr, sz, QEMU_MADV_MERGEABLE); - } - if (!backend->dump) { - qemu_madvise(ptr, sz, QEMU_MADV_DONTDUMP); - } -#ifdef CONFIG_NUMA - unsigned long lastbit = find_last_bit(backend->host_nodes, MAX_NODES); - /* lastbit == MAX_NODES means maxnode = 0 */ - unsigned long maxnode = (lastbit + 1) % (MAX_NODES + 1); - /* - * Ensure policy won't be ignored in case memory is preallocated - * before mbind(). note: MPOL_MF_STRICT is ignored on hugepages so - * this doesn't catch hugepage case. - */ - unsigned flags = MPOL_MF_STRICT | MPOL_MF_MOVE; - int mode = backend->policy; - - /* check for invalid host-nodes and policies and give more verbose - * error messages than mbind(). */ - if (maxnode && backend->policy == MPOL_DEFAULT) { - error_setg(errp, "host-nodes must be empty for policy default," - " or you should explicitly specify a policy other" - " than default"); - return; - } else if (maxnode == 0 && backend->policy != MPOL_DEFAULT) { - error_setg(errp, "host-nodes must be set for policy %s", - HostMemPolicy_str(backend->policy)); - return; - } - - /* - * We can have up to MAX_NODES nodes, but we need to pass maxnode+1 - * as argument to mbind() due to an old Linux bug (feature?) which - * cuts off the last specified node. This means backend->host_nodes - * must have MAX_NODES+1 bits available. - */ - assert(sizeof(backend->host_nodes) >= - BITS_TO_LONGS(MAX_NODES + 1) * sizeof(unsigned long)); - assert(maxnode <= MAX_NODES); - -#ifdef HAVE_NUMA_HAS_PREFERRED_MANY - if (mode == MPOL_PREFERRED && numa_has_preferred_many() > 0) { - /* - * Replace with MPOL_PREFERRED_MANY otherwise the mbind() below - * silently picks the first node. - */ - mode = MPOL_PREFERRED_MANY; - } -#endif - - if (maxnode && - mbind(ptr, sz, mode, backend->host_nodes, maxnode + 1, flags)) { - if (backend->policy != MPOL_DEFAULT || errno != ENOSYS) { - error_setg_errno(errp, errno, - "cannot bind memory to host NUMA nodes"); - return; - } - } -#endif - /* - * Preallocate memory after the NUMA policy has been instantiated. - * This is necessary to guarantee memory is allocated with - * specified NUMA policy in place. - */ - if (backend->prealloc && !qemu_prealloc_mem(memory_region_get_fd(&backend->mr), - ptr, sz, - backend->prealloc_threads, - backend->prealloc_context, - async, errp)) { - return; - } + host_memory_backend_apply_settings(backend, ptr, sz, errp); } static bool From patchwork Mon Jan 27 21:31:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=E2=80=9CWilliam_Roche?= X-Patchwork-Id: 13951727 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 712841A76D4 for ; Mon, 27 Jan 2025 21:31:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013516; cv=fail; b=feDaEJLEOVghvYIrmT6CBJSCMxAzosemYqtnsCm2iKOoijBKM2IfhqVea1JIm+W44cStx3I6CCGkG8CaY0x+q8z8xcnEXf44hn7bJDRSBesM0C7AmSlM1F+ym2JOsshekHRRUggVvApdZhNh5rFLZA8530YYVZOSVbiiJ6oeJGE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738013516; c=relaxed/simple; bh=RODvL4FVUS3zzA7DgYmKwMOCxdix/IPsXUqqcayUyLs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=BTJ+c+4dNLqjSM98PUKd3cdKrPcBVoweqJHMZySJAXbtwDKMv/jgPcWvEcWPLIPce6T3tnHjpCpTeaHazhLvs6kH/AEbN6ZWXIfiYT2lkoU3ZEFWEbab/rM3xFta1fu7z/xVfAWhQBHB638FL0kKzqLyIUOo3f6O4kHlgjg8lg0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=eM65M2jK; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=lJa89lhx; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="eM65M2jK"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="lJa89lhx" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50RL0lmF024590; Mon, 27 Jan 2025 21:31:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=q/xeNyOY+TV4ORploV63k4EIPm0Cbo9WXj8FEDVnMZA=; b= eM65M2jKvJWYchyEbqXaCDLDcbI/FFKzQkEcQQxw7NHBndLSey0q8Fo698/i4F97 Ne55URw8GCnHNRDGHSzB6l6OHbeWtgWG6qZVTRQi7zfP3plv7kkMotyCXLeS/1rP THs2+Z7GeK0Sst3uDfsttqzU9MVDV+o8OAkKbcIoNTPyWznHOJ9dmgBRQLXFndQd 1Jw6aYdueSUP7k4ZrM3yNBhHJU/MmwbYqOYOEVd0/G5Ff8t5vrn9v52x0+U5moJZ ets83OnSl5CMcY0DkFhu1lFjE6TsPYBq+59huzexDBr6xmgLYiCID+uUu15sFZ+k /RTpAvoNwhTnfWDIZ+rclg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ehpc8279-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:42 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 50RJrQHc021411; Mon, 27 Jan 2025 21:31:42 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2177.outbound.protection.outlook.com [104.47.56.177]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpd7hsr0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 21:31:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WYmyhPAvyWHTPczuckbntOa6Bxbb0atiPClgBJR7VnRMZHXIS4aqeiUmVtqhHE/QAzr9xkFWmaxKM97bfN5D8M6NtulAzeAeDIM2XH7EJT9Ha9Eh5k6gimJFZuYqzog4J7ZPZ0s6ASEWTwFQT1DoET98seSvwNylAU9BeCEIDW8k4VAAhCngFB/FUffsWD8ZAVUu2v0PXGJ15xp3+bEfMBjO/HYPjmWvDqpDvQeBG1mrG8qQB+/Dz1JB/GpicuO74U59+4aDsI95i/WKml7LcnhXz2Ifd5vRTC02KKvaezGdKbdkw9Ke1vsAq8kdroq+KDoY0HB36mi4dMYPxNhLXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q/xeNyOY+TV4ORploV63k4EIPm0Cbo9WXj8FEDVnMZA=; b=hM6ZPm1UG7joCcx16CHO9Mxv//wAtkMd5uh+VAMtlkXjpA66RRx/f1lqbsIQ83Wb06nlS8t4a9pZuyz6hxiww2C9ZTrfnCwK5m4QjHgzLteD2K1H3L1TY2C5HkoBt+7n2sOjoUJSLs6+zDM0eR7R0EH8DtwdPlTf6BRRGCwqakJn+SAw1BX1CObofFzHy+FhUVwHgcMrbZ7RaRVixEFdcP8zsU0iy4hSauaSoNpOJsMF4iYQXToexFkfCXo5rWqz0eAbDJ9eIcRdAVqf1TcJXmpdwG2RoXdnwLaF92b5LTMwh0tVkhp8wyfkiMtqz8XvsO9L1fIFgal7smhx4q5PBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q/xeNyOY+TV4ORploV63k4EIPm0Cbo9WXj8FEDVnMZA=; b=lJa89lhxZtU9Ee4GlJK5C+p/jVDk/ltayfUFFiqffsVma5ClQ1ypPitluLEPLMHWlfysiLtCPeuibPjmiqYagFmuWdY1DMG0SmZhm7LAaZdaBc2XDdPRGXPjbizRU4iU7EeV62Y+3RO/QSQ+u+PEDn4Uw8mMqo+nwWwTA0L2dh8= Received: from CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) by PH0PR10MB4614.namprd10.prod.outlook.com (2603:10b6:510:42::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.23; Mon, 27 Jan 2025 21:31:39 +0000 Received: from CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23]) by CH3PR10MB7329.namprd10.prod.outlook.com ([fe80::f238:6143:104c:da23%6]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 21:31:39 +0000 From: =?utf-8?q?=E2=80=9CWilliam_Roche?= To: david@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: william.roche@oracle.com, peterx@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, mtosatti@redhat.com, imammedo@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, zhao1.liu@intel.com, joao.m.martins@oracle.com Subject: [PATCH v6 6/6] hostmem: Handle remapping of RAM Date: Mon, 27 Jan 2025 21:31:07 +0000 Message-ID: <20250127213107.3454680-7-william.roche@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250127213107.3454680-1-william.roche@oracle.com> References: <20250127213107.3454680-1-william.roche@oracle.com> X-ClientProxiedBy: LO4P265CA0166.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:312::10) To CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR10MB7329:EE_|PH0PR10MB4614:EE_ X-MS-Office365-Filtering-Correlation-Id: 13aa597f-bff4-4764-9b35-08dd3f19fc03 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|7053199007; X-Microsoft-Antispam-Message-Info: I1elrxhJkM9TCFTwNUY+XuL3oy+N2hbr53p/YqSI0NRDF1xGe0A3LR9CN+cqRB25NSW83mmnKZsyV37J3emJQH5nn58UHGHrXSKGuL/HCqsRLmmKfyxeXuW8jNadjz5SdoptaiuJqeRPtZyOIsVweDJTWDNU2cY2pKVJwgb0MRyywuWBCXgA1jm9xCtnuEtkL5GH0XxJ4dlr5Sne1V9FFf3R2vc7O6WzjvW46uGvkvmq2tJs13BC6HjuU7n4FWpwTIm3l+g0ARfd2zbgMnYgikHr8Id7yiOgOLjCz7M3sOvwoqwzPC6VxQUthcSmPzYtvrhU5kj4DINXDhm4pAuVHDiChoDKVVUcfs4eAlZWgSc8QvRJyTv/AAU3BbWD9RZLgRje08L/JohEhQAL/gUrqB88A2/ohO1xi0HDhzfA8ulstTZMrgm10tpfjUY/Pp90RveHBFptEQaWv3j8d5mkYRt3wcD+fsi5z1a3F+BsSUMuyfMxk8LInscb+h4PgAV+XIItmvDymz4rGK/60qxVJ+SWK7O/b1Xy29GZOa56JR8V7igXwUpxqM2pFzTk20FgjbarEk7TFl6UABqK8WLuvwZShb5yuj1BC+X90tjaFWPNhQF3pp+ZLA+RSTcGAwV8e29ugmWnjJIrNTLV/gheYORwznnxn6HKdhYXiTrhrcsiCQ063bMSSUrOEHMKIlpkqFSBTAFwzeXH39/+xxliniGCvUrLWPhTaQI6lLrGnVIfiV0azImLj5SXQ01SgfX0DHGU3L4+Fnte8AXF7GF4V6ILkJ50ggF7OBZOzF8zuDeQwb+aKd7heE5Zr5DEdHCm3xI1ULc1NrKVztTKJAZgK71v5/3xlgNdulTKn5206FFpqVeG0TABn+Tn0UyzH8gMbYIIVJaQXcSZ4QuEjFH8pazEmLCBK8zQ+b45ajmqB5/dMBEFz70Co256Fpchx50SRUdEdmU/4P1RcdWuAn4QbdLXaiNsYhdbNm/QhK2lit9hOnIYWRcE9QzFC0pf10HLUvfARgYE6EbNpe1MsDi7RCw6vM5S4AmScEw/TOg5KWB5omrSCDb45jyPPonVhHcBcU3XN3nY45KIxB64Z2Ch9Mkv8MgYQzbMUnWisDfMj8l9CPWyLPu6PNJtDVWJjDYOc7qlJaHObMF8ymPWTpKvsVkZAadQD8+JDcatF1QoKhNHlk6awIPXB4CaPw9X9gZx83CxA7h7FRnQ9qJflZCBDOeBukXPTcZLEywJWtCR9SA1OXtt9A/9+4m/kktRj9GmF9E0uM6RUpZyjwf7WnoTbz6D+THPbQfpvzGW3nO/SPaCMw7+NDBL5jB0yDBd7AayCehzAXkrLOP4guxU+K8bIsfnEtBF2usp9cIohbToWnLRvcgqMW57gBEo71VoMMlZ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR10MB7329.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l8w9kcEUQPnw75PjAQd/tXrJuO6s1LAB8+XiS5j6Ptxy0TzGVcCExbrpIUZREtOiu2xFtOxkkPzp38R9kXjsDwrwqqPpz/vu2n4ZxoZbWGS8zDdb948pkDEKreAdQjyL4iUO9BSEuv+oZE6HyNeSh9mZKTGrVcSda4cSgDQhFDNgYcxRpWr/UHc5Ev9LIq8a0dsxcjqfOkguyhQkKJZJSLIfYzOns+xzoa99SR2wX12LWQ9U1bwzaD27rDJqFZDQ4mKVGnuDMUt/WWsfZDFSHtbMRhgIZpNgXBFC7S/9WDjjpiuRQC+/XPCAFhnOOqIxDDurlqnHwS4JAgHHvH3QZigU7WG8zLiw/FtbOs7MrvRuTi4vS4c8vFLPlBmNiMX9Me1VziO1BTwCONF56iVDRR16ztlLB9Lfs0Ukb34lLDH1UufJaOZ/wzfCn82LJ9iGATPh1MKyq+3+T6O+vpGEzFfTiVtxTqDP6eUeckNSBixByw5VSLGpL8O+zhLGtJuL7r5c3/pzWJu8jZ6yh++MMUg74ja+DTRQk0I5vPm1uWNoQsTfYxfIpfa0yegKOa1u4s6duMVLKAEGv93yAB8xvtOMuSKjje9ITCX6uvKFMmrZhp/VNGHCoGDAzL5+hoVTWCxXn8mZk/iQQThkxSTtSWXgZ4rFX/ERVg0+Q+i0XQWEyyvzOJDzWQVDzrb2T72Ac7+HTjdGBj6Ar5ivgFeGYF6pmNh7ztO695gE4qvVrrqLaIwyzBE2TMC04iIDxzEaKxcdIM2yAg8iRRyjpWJcE3XZSpcviJfQa6IEaLAW+U0GLvqxd7xr35T2Tknw3ifjSiGGyUic6cf6ryNW6ZN44HZc1z8g+AbFOyJnoxEC5FmokTTn2NhskxpoESmFtlLbjeVB7jquA99ZY6c4+yAVEBwDWm4puozXqBrcyAhnSvaC3vXfnhevdpv2hwM1G6nAgPQBulmWnEJr86huNDImzLmTJr7D1l4AawNlvDGTVQpoaDc4VauZPk+zTCyAYemeIL9ixS2LDsn7qeZrRkaQSI+LBngDltP66Rz4WIcnD8iJrw5Mk4ZcomQ3hnDcxr1RDrCIwZkBpMYVRS6FE1kMlWWFqXJI68+6/f2Zb7cgt8Il0eU6NYADVVLXD6HvUmUIA6mIiKEZvbci8XxmivEveF4PwoDDVxdx/bZowTXYY/jpXeLnp+u+9TJdXN82539sdshTmwZtRKiKRc87bN+e/Mu1dfPIOUTKvDa0eV91pZatEYsasU2IrRa9Tr3+a69tyh65q0NEF6s/LURrCj2kuWIaKtt29Gv8cJ8A4ihhXGvK8FBOQCiuoxDBkJGmEqo9hgw0K3qlWQrKMBDuJW0m6lzd7keynTjfBqEucWYy5fpCJ2AOR7k1E0Mx6b8FKOAgB/31BwRcAIKrXE0F+sYrxu+aY5F+A+k0X2xMO1fByt8mnETyBH4U0by7QPPROIl983MProgNTttVfsRcor7E0BUPxqE3+TBKoBVzSq37/TKKCyht08aZGxe34nRrRggsGy/FTrjlSm3rA+HixGaoeLsXwby1Lxn83ewI4FI9REAQ0k24LJhxfINGnAYuQfyzCApVeNyNC36hDuHK2tF5tg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mhkhB3EED9S5ZI6x8xyo1KoIIFl1B6wOH5u9bulwYn0qaTIgwwjdk1CPelpyJxlPOWTxjgCeoUtRjM/kb/FIfu61DQpMwW4AfFRRLdbZf2COjlfiMDLSKPyaIMrJFupRjcGapt0hzKpz1S3DaNuTEO3NNqUZNISDEcGPE7XHaDOBP2dluUY0hgK1ojK37QrFe2ueOkvuIqlRCXcbcu1cXvRot+cnDU7KhiwIfzBjuXzYo4E1MNM5IGy6/zvFxNvt/zPXTr9pyyH//7PAS2AeTMF4pm4UL++HDmRDvdkK9BaENiRp/2ZqoXvTaofThV+El+nSFCeIKF4veywMK91WDk8R/6WALDf1uWwJLjb6Tfy4gXh404GGB8ZIsx+l00P3ugGKGuuSq2+3Mxt9Be0sP3v6BppsDc8JVjDWMDpdUMB+iTBlqxbNMGEoBTsCzAOVsTKYg1YInplWrbAfPrqxqjsOUlEEj8VxZuiNSHrGWfDIVwxQTwNLVHEWb5m5MD7tFpaVMq/w/SqesAYYWnO5oOU2czl6pemCVLzpmvnbM9x5K0YTZVlr0KFraO3J7sAYM+OolUwbpQeq/XLTtIWD1XPsptIgEjGZWJRrKgxCUmA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13aa597f-bff4-4764-9b35-08dd3f19fc03 X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB7329.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 21:31:39.2705 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: d1ljCZruB4zDfgAsisFP+JiuxwCbbtz/yinN/frIftm+0suWiUjlf0bSE3lXCpgRosDOkQKZE4tR6F/+vLyocfG1b5/Ouy63fYRSG1iLLWg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4614 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_10,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 mlxscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501270169 X-Proofpoint-GUID: 30mOedlXQjhBSKwH9hLv5wLDRiHvjScE X-Proofpoint-ORIG-GUID: 30mOedlXQjhBSKwH9hLv5wLDRiHvjScE From: William Roche Let's register a RAM block notifier and react on remap notifications. Simply re-apply the settings. Exit if something goes wrong. Merging and dump settings are handled by the remap notification in addition to memory policy and preallocation. Co-developed-by: David Hildenbrand Signed-off-by: William Roche --- backends/hostmem.c | 34 ++++++++++++++++++++++++++++++++++ include/system/hostmem.h | 1 + system/physmem.c | 4 ---- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index 46d80f98b4..4589467c77 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -361,11 +361,37 @@ static void host_memory_backend_set_prealloc_threads(Object *obj, Visitor *v, backend->prealloc_threads = value; } +static void host_memory_backend_ram_remapped(RAMBlockNotifier *n, void *host, + size_t offset, size_t size) +{ + HostMemoryBackend *backend = container_of(n, HostMemoryBackend, + ram_notifier); + Error *err = NULL; + + if (!host_memory_backend_mr_inited(backend) || + memory_region_get_ram_ptr(&backend->mr) != host) { + return; + } + + host_memory_backend_apply_settings(backend, host + offset, size, &err); + if (err) { + /* + * If memory settings can't be successfully applied on remap, + * don't take the risk to continue without them. + */ + error_report_err(err); + exit(1); + } +} + static void host_memory_backend_init(Object *obj) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); MachineState *machine = MACHINE(qdev_get_machine()); + backend->ram_notifier.ram_block_remapped = host_memory_backend_ram_remapped; + ram_block_notifier_add(&backend->ram_notifier); + /* TODO: convert access to globals to compat properties */ backend->merge = machine_mem_merge(machine); backend->dump = machine_dump_guest_core(machine); @@ -379,6 +405,13 @@ static void host_memory_backend_post_init(Object *obj) object_apply_compat_props(obj); } +static void host_memory_backend_finalize(Object *obj) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + ram_block_notifier_remove(&backend->ram_notifier); +} + bool host_memory_backend_mr_inited(HostMemoryBackend *backend) { /* @@ -595,6 +628,7 @@ static const TypeInfo host_memory_backend_info = { .instance_size = sizeof(HostMemoryBackend), .instance_init = host_memory_backend_init, .instance_post_init = host_memory_backend_post_init, + .instance_finalize = host_memory_backend_finalize, .interfaces = (InterfaceInfo[]) { { TYPE_USER_CREATABLE }, { } diff --git a/include/system/hostmem.h b/include/system/hostmem.h index 5c21ca55c0..170849e8a4 100644 --- a/include/system/hostmem.h +++ b/include/system/hostmem.h @@ -83,6 +83,7 @@ struct HostMemoryBackend { HostMemPolicy policy; MemoryRegion mr; + RAMBlockNotifier ram_notifier; }; bool host_memory_backend_mr_inited(HostMemoryBackend *backend); diff --git a/system/physmem.c b/system/physmem.c index 146a78cce7..52cfdeabe7 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2222,7 +2222,6 @@ void qemu_ram_remap(ram_addr_t addr) { RAMBlock *block; uint64_t offset; - void *vaddr; size_t page_size; RAMBLOCK_FOREACH(block) { @@ -2232,7 +2231,6 @@ void qemu_ram_remap(ram_addr_t addr) page_size = qemu_ram_pagesize(block); offset = QEMU_ALIGN_DOWN(offset, page_size); - vaddr = ramblock_ptr(block, offset); if (block->flags & RAM_PREALLOC) { ; } else if (xen_enabled()) { @@ -2252,8 +2250,6 @@ void qemu_ram_remap(ram_addr_t addr) exit(1); } } - memory_try_enable_merging(vaddr, page_size); - qemu_ram_setup_dump(vaddr, page_size); ram_block_notify_remap(block->host, offset, page_size); }