From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24D4BC47073 for ; Sun, 7 Jan 2024 20:42:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48B0F6B006E; Sun, 7 Jan 2024 15:42:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 414936B0074; Sun, 7 Jan 2024 15:42:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28DAA6B008C; Sun, 7 Jan 2024 15:42:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 126306B006E for ; Sun, 7 Jan 2024 15:42:17 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CD03E12023D for ; Sun, 7 Jan 2024 20:42:16 +0000 (UTC) X-FDA: 81653687472.17.3C190F0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 7D9464001B for ; Sun, 7 Jan 2024 20:42:14 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J8+9XBC4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704660134; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SBgxN2GhuyUwrUEqvRsz7OK6kJq+81MHnX3+jPXhnyM=; b=F3O/ZzTVx9ITM04ERu090OS5vcgHcAi65HUeIVu2dR1E2K/DbXvP2XapgzW02K7cB4IfBT QpmLOH28DOfkcWKabNAmN7BWCZx9QUW8wXwfuccYXE7h0M5g7DYgvA2GsOG1K89c1yBqIw 0b6tXoX6tdePSvNHtOHFX6F56S0GeYE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J8+9XBC4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704660134; a=rsa-sha256; cv=none; b=gIDMK62U/j95SauXPKkMfpboEkQJVQfto26XFwuAdbhgWfv040aDG5gEQC1Bqs//cncYdl ht58phVY3PJlNCTleVFywee+gHY2FRTCiHozM1PLyCJ5bOLgrJBnGo62zR6ajw2dkVV7DX W7MmibrCNbZTlqJm2/GFgnV2PqVCRbs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704660133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=SBgxN2GhuyUwrUEqvRsz7OK6kJq+81MHnX3+jPXhnyM=; b=J8+9XBC4ET0hsEGpwJI0WVQ/FQZxdu0Duezabm2o2wfG1xkvnFakypqmN4GzPAsrQiuWU/ 1AgHDBaYBwrBivDeBzsfl/E2J7gQtZkwIMxe0p4OU+fAxHlCt/IFXcUWd6FIdB7fP3/M9I +UQ5NKMjAKKKL8o3kJNQuGu0zfDpB3M= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-pmhdpVoDO-2Iti6TiIavPA-1; Sun, 07 Jan 2024 15:42:12 -0500 X-MC-Unique: pmhdpVoDO-2Iti6TiIavPA-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3368c707b03so786985f8f.3 for ; Sun, 07 Jan 2024 12:42:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704660131; x=1705264931; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :references:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SBgxN2GhuyUwrUEqvRsz7OK6kJq+81MHnX3+jPXhnyM=; b=MIaO9N3CMIIPNweYuFyBIBr0e2q942SsoKIIIJzHAovNGOeWOItstuiRgvZXvcbRK/ L7rXysGekuZqSzELr8IKgRC36Q1OjQdHwK5dkHgarVEeENMvOOy5XTpfID4FoVRWZ1o/ awcSlepJC4heJCSn4kJujrpn607DmICUCBP+nX2G65l68KA9+mNVfsGPFJ29C8toSE9V /0N+Oj/rRKsVPp6tzp77ynzfJbl2gePHHiGNKar/bGBkJpStB3cJd+zj90rlMeKQzgvA j2CEuUu8x69HzCCI7FWW6q9MfgS8mtRg0k+K6NUj6kwAaxn8nSq+SaBAGpXQC8wzy4ny Mz3w== X-Gm-Message-State: AOJu0YxQEXWnuWKdx2/HsFt/PwLdby6amXxWsaP/yGGSbXejkUjIbU+x etZU7MqclOM0jFSt6myk19ulUdMJTwyT/7U57JIiXRv0STpFEjd0cSqU9CYPaKRU7ShsGt+H8yY U2CJasiEXPsDLmmaPHY0= X-Received: by 2002:a05:6000:1968:b0:337:4866:f547 with SMTP id da8-20020a056000196800b003374866f547mr1540018wrb.23.1704660131099; Sun, 07 Jan 2024 12:42:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEWQLRWQyBMq48L73eKvEEeR9zCiXqFh71MTmc8iwwbnjYzh4jKeaOFt2Er6ZFk7xFIFvddkw== X-Received: by 2002:a05:6000:1968:b0:337:4866:f547 with SMTP id da8-20020a056000196800b003374866f547mr1540015wrb.23.1704660130746; Sun, 07 Jan 2024 12:42:10 -0800 (PST) Received: from ?IPV6:2003:cb:c71e:8800:f052:271f:565d:db9c? (p200300cbc71e8800f052271f565ddb9c.dip0.t-ipconnect.de. [2003:cb:c71e:8800:f052:271f:565d:db9c]) by smtp.gmail.com with ESMTPSA id y5-20020a5d4ac5000000b00336670abdcasm6077317wrs.40.2024.01.07.12.42.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 07 Jan 2024 12:42:10 -0800 (PST) Message-ID: <7f39af8b-3338-4167-83e5-be5840193e9c@redhat.com> Date: Sun, 7 Jan 2024 21:42:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] selftests/mm/ksm_functional: prevent unmapping undefined address To: JP Kobryn , linux-mm@kvack.org, akpm@linux-foundation.org References: <20240105202401.28851-1-inwardvessel@gmail.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240105202401.28851-1-inwardvessel@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 7D9464001B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: njucqi3mpfthjmpyewg11xzjwnr1whb9 X-HE-Tag: 1704660134-932003 X-HE-Meta: U2FsdGVkX1/m06Thq6ifMZ6ELG3OrkmB6gdFwuNENNDlASEKTn4mvhsvIaAhI1kQVDHMScAZh9e6r5VgVLsxBj9yEvewZWE2IfMGDxKvP5yPVGmKDF+vhE9mkYBOluvHRaa4q5EHlJixF2LHMTEoJXXyQxSlHYiSgX3bSUm5WHbRmn80hjdnpKd3KkmMpcv+uTrLL5CzJHRfuu7vxV0yt0ePNXfsEiDKWKN7QIflIuI5e+Jfsd3wEKIB8synND37e7BcXVIEFrXU8/ybDDlyMiyIKETyv2Sw66zEoBi8cUV4bEcOe3x8hLTKOCvO3FnT+xQo3e/blmJ1tTtexXonJk0F+jemNSvPPsi8I8u7rG4Vvd6v4ODHtWhya3uz8P2rgdg2hVMO7MeHm+fZrreBY6PUBLSDphhehOaj+Riekq2kcuMfrcxQmd31P0T7KUCkL9RZo4h+5pLO1//+29l3HhHGoFRb8tXeaY5cHFn+42MZ91bpbtE3MS2FtfdyUJjk07k3Dr6bwmJIIRPEvUl6fpn6R/DyXs20+fpce+oqPPRGS9CphFzbfsi/Kk0Jx6tV5Y42oObh/g0s//bxkKEjqRWzVGGno+vWr/9FWU7bcFg8OVjBk8CjzIUA4aeS/eVFoFe0Yk8+rCXb6dLhoKtfVRl6epD9ylvW2qIcHxXgWMAkXwtlXugwFHpYTr0KKJSAnuScY8wvgPXrMZctrk5gs7gNLpeCTjQ5N1MTVxRmRvyqzkD/SGkXAXKRwcisq4DIG248Xkr1+Gp8lgCh2hvPyPNV/c/k18+FOqwcW+qWD1XR1ZN0WIvIuvbYpmg5UHDOoGkU8ZKQ2p0x2U22MchrYwFt/PQCAg1h9jvRax7+u05ZQm+8k1Rz0eWgjLMyvZrCIO/HAUZL12MphMPqtlOlrndSyrCxJYvTzCYiCm9NRvjNUyuAOJwyZVNPac/Nma7CBLrD4iEwiWSrRjp53Or /Xizp0Ts 5esy3qU6vhAYJPeUydlvVBdISlMAOthgT4hMA4CcrAGQD9UALU4d4Nk81XcG9dgm9k5Io7S7gH+H+VBLOrcX2lkA+WpZJeroApKQrLRPXMu6eJcuijM+tatF5iabK4IWXkuxsMX6gieOpTrS7kzIX0B0Fam7/Q2/Ij7TVYLQnfBYzWK303sFqUOU/eTP/hgjU052QRAhr0BIfp9TYh5qCrG6S3wMhQxQnKKOTkSBG5I5YnfZPhVQONpQQx5CYWqbBLfig2Rj5kHRleb5WNvGjsaeaWvPvqANavsOjkE/hYCbtW0/AVGUYc4YLT/0hM3oy4igep9s3GDEuu0l6RxRhFAC1pcFHAUem5qEG/lLdx4lC16LdQs5ZBUeVNle+krbTTJjiNB25Sk4XsMqDs4ddEQYdsGshAcWFhjQdR64Z9Zb4cvaWXgOGcltyljZN3I6KXceq5okuUCIyKhmOkyQJNHlo9sDTdj/tsg71qKtzJ80prDyjUdX+Kr6yVriSecGOmkVI5M741OfMXRM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 05.01.24 21:24, JP Kobryn wrote: > Replace some goto statements with return statements so that unmap() is > not called on an undefined address. This change is made so that unmap() > can only be reached after mmap() is called (and the address mentioned is > defined). Returning MAP_FAILED seems acceptable since client code checks > for this value. > > Fixes: 42096aa24b82 ("selftest/mm: ksm_functional_tests: test in mmap_and_merge_range() if anything got merged") > Signed-off-by: JP Kobryn > --- > tools/testing/selftests/mm/ksm_functional_tests.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c > index fbff0dd09191..d615767e396b 100644 > --- a/tools/testing/selftests/mm/ksm_functional_tests.c > +++ b/tools/testing/selftests/mm/ksm_functional_tests.c > @@ -155,12 +155,12 @@ static char *mmap_and_merge_range(char val, unsigned long size, int prot, > /* Stabilize accounting by disabling KSM completely. */ > if (ksm_unmerge()) { > ksft_test_result_fail("Disabling (unmerging) KSM failed\n"); > - goto unmap; > + return MAP_FAILED; > } > > if (get_my_merging_pages() > 0) { > ksft_test_result_fail("Still pages merged\n"); > - goto unmap; > + return MAP_FAILED; > } > > map = mmap(NULL, size, PROT_READ|PROT_WRITE, Indeed, thanks. Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb