From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78FC83DA5BA for ; Wed, 8 Apr 2026 17:26:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775669179; cv=none; b=bOikxmVRnvApfxsfu1TpFgV9Mrv3QhVIsbH4+d0HVx+zFDe/WB5QxbFWGgcXiUpqXcOhfBHPpEkGAYEu2a+mf/L8tY/AFwqk7MGzGckTHePc5Dpy87uz/HFpo4DYPV6RULLXtM8ZUl0nUgnaBjPwzH3cqkiwhrA0N3L1kSEELPQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775669179; c=relaxed/simple; bh=9j+Yjxv5DCIhDgqhSAFcOR8cdCu2/7Gl8VDuHjhEuMY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uuJKkwYXYzl1eNPX+xjA+y0Zoca3Scxkgof/OEFA099LPHWxljwsriG8E1jgUkHiTnVcIq9pJA8rGW8aglgLgs04/U/OpjlGR7/73XCAyUOZi56iNahCO39sV8QOQWNIG1WF0B9td91vkliJcPsXwW+H8oBBQy7FjZYVsWyKB9Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--wyihan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=pZpMa2Hc; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--wyihan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pZpMa2Hc" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-35842aa350fso310514a91.0 for ; Wed, 08 Apr 2026 10:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775669178; x=1776273978; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=coXWpWCJYRhXsanWDc3UBlYfp3L/GbnMTag+lQMZ4EU=; b=pZpMa2HcT2bdNr83iQTkU3t7HSRVAhYDWaB/RJjns3e2uQsLm/nYsHxOb5rfwyFb4S gblv6mXZjCjiOjytU7ade2fWeYcyGLvMC92IVqy8YuNEp8E7ZgTz961JnUKocngMPajQ Mlok2zAD14pzsacUBKgVjzZf1M0wgTnOpz0KpGMZdXXC1dYRhgpJsJVlIFjpv0IMPY7m oyCrjloPvWTxmOYDOaPCu8lIAkgdXdPPIskKvMeDS8X0CT0ylTZZEkvmI6LgIKKOIfu+ oz6nerElY53poRvf2/ss+TCnCNE1PDfnLE3UjpxIDso3tUw7OrqFH06zWbI+2WtdX3il GJEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775669178; x=1776273978; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=coXWpWCJYRhXsanWDc3UBlYfp3L/GbnMTag+lQMZ4EU=; b=Wpj4z0jlf96ZDHR9lA8/ZJPlk9WNk+dIOs/KVgT87liF03EjoroNC4UFU+6ePiEPmf vqnq/q1WN54EX2EMjizaKzfcuLd7ZSwpsGDHFVFQYPHC+RQUZQsnbZBWs+Bm/CCqbQHE rV1pTP4UwglVK8aASNnaEBDlooQVL+MzKQwiZqbe/rnmrOOHC94oC+lY3E4dcxiahsXb N3StCGyfIPA/4PgOLFxGBFTpJW5CDruydIIoeoIj6xTDhhaGGAGdlYmE1JF5YcbO3LfL rZ65Pxr7lL9tQuhBkqRZ6NtYlLBA/xVLnT18lQmJvqkmyVEXzlgvkhLXPtZ2Pdvaf0d2 5PjQ== X-Forwarded-Encrypted: i=1; AJvYcCXANpcQhF4epU12JIi0Ygr1Un6REzqwS80PN2RpgMwMUfNKfwyxdC22HpXw4UGQbyBcI0InJuHeYJSwdFo=@vger.kernel.org X-Gm-Message-State: AOJu0YziypSS2lGXsC4rRtT1WTHJ4JusZf6+28pj48WP0UnhHPEHfQPB QDYg88Dq0uS44CD1sS+rAKiL4vUN8So+jDKG6ksv6aOB59BhsR4iqoCdr6JAt907btkKYNpBtNs AAPNnaA== X-Received: from pjbcl15.prod.google.com ([2002:a17:90a:f68f:b0:35d:a03b:ab5e]) (user=wyihan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:52c3:b0:35d:a861:36de with SMTP id 98e67ed59e1d1-35de691b394mr22211390a91.24.1775669177699; Wed, 08 Apr 2026 10:26:17 -0700 (PDT) Date: Wed, 08 Apr 2026 17:24:46 +0000 In-Reply-To: <20260408-memory-failure-mf-delayed-fix-rfc-v3-v3-0-718f45eb7c75@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260408-memory-failure-mf-delayed-fix-rfc-v3-v3-0-718f45eb7c75@google.com> X-Developer-Key: i=wyihan@google.com; a=ed25519; pk=cRi0fKzS5BMxlHyHY2pJv3w/1zcgfYKr6EYGYppdMYc= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775669168; l=4632; i=wyihan@google.com; s=20260319; h=from:subject:message-id; bh=9j+Yjxv5DCIhDgqhSAFcOR8cdCu2/7Gl8VDuHjhEuMY=; b=ZLj3IPnlSz73RcVt/W7CdlvSDsYMGQCljZ+P1jxfdDIyI2haYYqfl7EVXP3SrZ7hpSAi0brzc aAD0ijgQuUJD3pVUZ4XpVhZmt5xnWRUQ+TjBbKyJ7ygMxyHCoLl8kxe X-Mailer: b4 0.14.3 Message-ID: <20260408-memory-failure-mf-delayed-fix-rfc-v3-v3-5-718f45eb7c75@google.com> Subject: [PATCH RFC v3 5/7] mm: selftests: Add shmem into memory failure test From: Lisa Wang To: Miaohe Lin , Naoya Horiguchi , Andrew Morton , Paolo Bonzini , Shuah Khan , Hugh Dickins , Baolin Wang , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: rientjes@google.com, seanjc@google.com, ackerleytng@google.com, vannapurve@google.com, michael.roth@amd.com, jiaqiyan@google.com, tabba@google.com, dave.hansen@linux.intel.com, Lisa Wang Content-Type: text/plain; charset="utf-8" Add a shmem memory failure selftest to test the shmem memory failure is correct after modifying shmem return value. Test that + madvise() call returns 0 when the poisoned shmem page is clean + trigger a SIGBUS when the poisoned shmem page is dirty + trigger another SIGBUS when the poisoned shmem page is fault-in again. Signed-off-by: Lisa Wang --- tools/testing/selftests/mm/memory-failure.c | 109 +++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/mm/memory-failure.c b/tools/testing/selftests/mm/memory-failure.c index 3d9e0b9ffb41..eb3f8d98f6c9 100644 --- a/tools/testing/selftests/mm/memory-failure.c +++ b/tools/testing/selftests/mm/memory-failure.c @@ -30,9 +30,14 @@ enum result_type { MADV_HARD_ANON, MADV_HARD_CLEAN_PAGECACHE, MADV_HARD_DIRTY_PAGECACHE, + MADV_HARD_CLEAN_SHMEM, + MADV_HARD_DIRTY_SHMEM, MADV_SOFT_ANON, MADV_SOFT_CLEAN_PAGECACHE, MADV_SOFT_DIRTY_PAGECACHE, + MADV_SOFT_CLEAN_SHMEM, + MADV_SOFT_DIRTY_SHMEM, + READ_ERROR, }; static jmp_buf signal_jmp_buf; @@ -165,17 +170,21 @@ static void check(struct __test_metadata *_metadata, FIXTURE_DATA(memory_failure case MADV_HARD_CLEAN_PAGECACHE: case MADV_SOFT_CLEAN_PAGECACHE: case MADV_SOFT_DIRTY_PAGECACHE: - /* It is not expected to receive a SIGBUS signal. */ - ASSERT_EQ(setjmp, 0); - + case MADV_SOFT_DIRTY_SHMEM: /* The page content should remain unchanged. */ ASSERT_TRUE(check_memory(vaddr, self->page_size)); + case MADV_HARD_CLEAN_SHMEM: + case MADV_SOFT_CLEAN_SHMEM: + /* It is not expected to receive a SIGBUS signal. */ + ASSERT_EQ(setjmp, 0); /* The backing pfn of addr should have changed. */ ASSERT_NE(pagemap_get_pfn(self->pagemap_fd, vaddr), self->pfn); break; case MADV_HARD_ANON: case MADV_HARD_DIRTY_PAGECACHE: + case MADV_HARD_DIRTY_SHMEM: + case READ_ERROR: /* The SIGBUS signal should have been received. */ ASSERT_EQ(setjmp, 1); @@ -260,6 +269,20 @@ static int prepare_file(const char *fname, unsigned long size) return fd; } +static int prepare_shmem(const char *fname, unsigned long size) +{ + int fd; + + fd = memfd_create(fname, 0); + if (fd < 0) + return -1; + if (ftruncate(fd, size) < 0) { + close(fd); + return -1; + } + return fd; +} + /* Borrowed from mm/gup_longterm.c. */ static int get_fs_type(int fd) { @@ -356,4 +379,84 @@ TEST_F(memory_failure, dirty_pagecache) ASSERT_EQ(close(fd), 0); } +TEST_F(memory_failure, dirty_shmem) +{ + int fd; + char *addr; + int ret; + + fd = prepare_shmem("shmem-file", self->page_size); + if (fd < 0) + SKIP(return, "failed to open test shmem-file.\n"); + + addr = mmap(0, self->page_size, PROT_READ | PROT_WRITE, + MAP_SHARED, fd, 0); + if (addr == MAP_FAILED) { + close(fd); + SKIP(return, "mmap failed, not enough memory.\n"); + } + memset(addr, 0xce, self->page_size); + + prepare(_metadata, self, addr); + + ret = sigsetjmp(signal_jmp_buf, 1); + if (ret == 0) + ASSERT_EQ(variant->inject(self, addr), 0); + + if (variant->type == MADV_HARD) { + check(_metadata, self, addr, MADV_HARD_DIRTY_SHMEM, ret); + ret = sigsetjmp(signal_jmp_buf, 1); + if (ret == 0) + FORCE_READ(*addr); + check(_metadata, self, addr, READ_ERROR, ret); + } else { + check(_metadata, self, addr, MADV_SOFT_DIRTY_SHMEM, ret); + } + + ASSERT_EQ(munmap(addr, self->page_size), 0); + + ASSERT_EQ(close(fd), 0); + cleanup(_metadata, self, addr); +} + +TEST_F(memory_failure, clean_shmem) +{ + int fd; + char *addr; + int ret; + + fd = prepare_shmem("shmem-file", self->page_size); + if (fd < 0) + SKIP(return, "failed to open test shmem-file.\n"); + + addr = mmap(0, self->page_size, PROT_READ | PROT_WRITE, + MAP_SHARED, fd, 0); + if (addr == MAP_FAILED) { + close(fd); + SKIP(return, "mmap failed, not enough memory.\n"); + } + FORCE_READ(*addr); + + prepare(_metadata, self, addr); + + ret = sigsetjmp(signal_jmp_buf, 1); + if (ret == 0) + ASSERT_EQ(variant->inject(self, addr), 0); + + if (variant->type == MADV_HARD) { + check(_metadata, self, addr, MADV_HARD_CLEAN_SHMEM, ret); + ret = sigsetjmp(signal_jmp_buf, 1); + if (ret == 0) + FORCE_READ(*addr); + check(_metadata, self, addr, READ_ERROR, ret); + } else { + check(_metadata, self, addr, MADV_SOFT_CLEAN_SHMEM, ret); + } + + ASSERT_EQ(munmap(addr, self->page_size), 0); + + ASSERT_EQ(close(fd), 0); + cleanup(_metadata, self, addr); +} + TEST_HARNESS_MAIN -- 2.53.0.1213.gd9a14994de-goog