From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (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 8A5371B0F1E for ; Thu, 2 Jan 2025 21:19:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735852789; cv=none; b=Zj3VvDg2wZYe9Ba7Hg3cl07GcW2xx1JA9+OavV/r93zkaejOiIkQmtf94JDHYvCkxjX6xjZ94vtPe8fzE2o7uNWmaPDX7QZcp5Im1D5L7u74XUFJrjC1YiGrY1UaGfN16834NvHDiIbDCbdrdKElZy7WS5oQ9Q1ZNWZWcO+g7aM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735852789; c=relaxed/simple; bh=DZpepdt0D7BoD/2lYM3PLrGAdcHfwsBLNF7IqjtIIyA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Zd+19rdksiIN2rLFsC++D7vNt2JR0U2x+nJ+1KZjJtYyLgOZX58XE6765FL24Qvj4akUYXUBHZPffwIwDB9+5ML3AP8XRjcxriRh4mK5mTBAwR8wgcMaPghI4R8LcxJcF4li7EXoc08pIse0deoVXRgN2vAT/Ildeht16TOfTJM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EqaxXsTq; arc=none smtp.client-ip=209.85.166.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EqaxXsTq" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-844df397754so449967639f.2 for ; Thu, 02 Jan 2025 13:19:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1735852786; x=1736457586; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=fqSBiemQ2Bz4aDXI0PsW2FV8+vQOaGGeqetFAobMaIk=; b=EqaxXsTqULSrS7J8oANbp/GqTm4s/BidJDrHftYoipDxTVZX7ksfDnM3W/oula570Q wmB5QYmHH7UWxz8Q0uyxxA/xUZRfK4R1gLipbek8XddV2vLxkwEzDj6yv/IdQbksqMjQ bYWQcxfMv95GWUgSmWNKy4A/42/uUcW4nXv7s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735852786; x=1736457586; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fqSBiemQ2Bz4aDXI0PsW2FV8+vQOaGGeqetFAobMaIk=; b=HDFPhrCk4POl5xX2+GZfgwkLD7kcvDjXEnRsb9p0LJ9Pv1bqU/pvwT4Otprawo+wg2 EZC/9m8uRnBz+dhpThyX5X3e3bSi5RiN4Q7c9rytWMD50o91Mx0voEQpw3Wulgn+k3eq Q1eD+XXfWLIc9nWb8LjWqXdeSEUcgcacsnN3bYNrtOHnlfcfwqLUmyQVywnLj9pKqrJf MzNdgiebJgId2OJGI2v/eepF17N4qbve+FECCYiwTyyr1qflOaMQ7LLAIvegA+9biyRL HY7T6BmEGKtukWMfOUgficqRhD7Bn3vVfrhI50cRkXI8A/A6IC+UjmHbgiRTvOO9FjE8 PMRA== X-Forwarded-Encrypted: i=1; AJvYcCXNLhmT/usw7hYZtrIAy+zl7hpTsuBTZ/ZfF7t6o+NeNxCKXJnkEqYt2T8MuELIEYwb5h1eoiUUzqZ0phk=@vger.kernel.org X-Gm-Message-State: AOJu0YxDZULcK2iqLn97huyeyLzNtOoTe7X5zMDuJ+yCVRbYM4BO7zRG tOk1erM8rkQinHO+RhMeIP6bknZAh1lySRuezc3ueA7UElQpT9yq2xJOOJGENRA= X-Gm-Gg: ASbGncvlC/2Bi+09bCWT0VJAYJHgnlZ/SZmhuRmOU5QKMMGJ/4OF3Ntl/XNb02qxHw0 6Fmv5+8MoG88+SQEWLrMxyRwFcUzQnPQCe15TZEEX9eOmn78LmGjCWHcFLvZwOAMY7Y8p1CU9EX YIf1maOIYAy9GTI/7f5DdSONv/V75915K2iQoGXXNy4B2OcKDLxfgDxVvBQIbZkeHReUd4RneRw VQNwVCmNa510BVVUqRJSGcpRmcv7gImKjrRpkRV+Zbn60dZ+2huR6rekbM4F6DRlLT7 X-Google-Smtp-Source: AGHT+IEK/JzaNsJZOqhdk+7MFsiTwmma6S0mMV1zPf9tGg8pwTfMuDUpDINXDedjU/9t6jSnmAXLDg== X-Received: by 2002:a05:6602:60c3:b0:83a:639b:bc44 with SMTP id ca18e2360f4ac-8499e4ee011mr4149299339f.3.1735852786669; Thu, 02 Jan 2025 13:19:46 -0800 (PST) Received: from [192.168.1.128] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-8498d4253c0sm686345539f.0.2025.01.02.13.19.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jan 2025 13:19:46 -0800 (PST) Message-ID: Date: Thu, 2 Jan 2025 14:19:45 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] selftests/ring-buffer: Add test for out-of-bound pgoff mapping To: Steven Rostedt Cc: Vincent Donnefort , mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, kernel-team@android.com, aha310510@gmail.com, eadavis@qq.com, linux-kselftest@vger.kernel.org, Shuah Khan References: <20241218170318.2814991-1-vdonnefort@google.com> <20241223220504.4ae4adf2@gandalf.local.home> Content-Language: en-US From: Shuah Khan In-Reply-To: <20241223220504.4ae4adf2@gandalf.local.home> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/23/24 20:05, Steven Rostedt wrote: > > Hi Shuah, > > Care to take this through your tree? > > On Wed, 18 Dec 2024 17:03:18 +0000 > Vincent Donnefort wrote: > >> Extend the ring-buffer mapping test coverage by checking an out-of-bound >> pgoff which has proven to be problematic in the past. >> >> Cc: Shuah Khan >> Cc: linux-kselftest@vger.kernel.org >> Signed-off-by: Vincent Donnefort >> >> diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c >> index d10a847130fb..a58f520f2f41 100644 >> --- a/tools/testing/selftests/ring-buffer/map_test.c >> +++ b/tools/testing/selftests/ring-buffer/map_test.c >> @@ -233,12 +233,18 @@ TEST_F(map, data_mmap) >> ASSERT_NE(data, MAP_FAILED); >> munmap(data, data_len); >> >> - /* Overflow the available subbufs by 1 */ >> + /* Offset within ring-buffer bounds, mapping size overflow */ >> meta_len += desc->meta->subbuf_size * 2; >> data = mmap(NULL, data_len, PROT_READ, MAP_SHARED, >> desc->cpu_fd, meta_len); >> ASSERT_EQ(data, MAP_FAILED); >> >> + /* Offset outside ring-buffer bounds */ >> + data_len = desc->meta->subbuf_size * desc->meta->nr_subbufs; >> + data = mmap(NULL, data_len, PROT_READ, MAP_SHARED, >> + desc->cpu_fd, data_len + (desc->meta->subbuf_size * 2)); >> + ASSERT_EQ(data, MAP_FAILED); >> + >> /* Verify meta-page padding */ >> if (desc->meta->meta_page_size > getpagesize()) { >> data_len = desc->meta->meta_page_size; >> >> base-commit: 61baee2dc5341c936e7fa7b1ca33c5607868de69 > > You can ignore the above "base-commit" (I don't have it), as it applies > fine to v6.13-rc4. > Applied to linux_kselftest next for Linux 6.14-rc1. thanks, -- Shuah