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 F277EC00528 for ; Tue, 1 Aug 2023 16:54:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63A23940029; Tue, 1 Aug 2023 12:54:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E99F940010; Tue, 1 Aug 2023 12:54:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48B13940029; Tue, 1 Aug 2023 12:54:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3B398940010 for ; Tue, 1 Aug 2023 12:54:32 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D9A96120209 for ; Tue, 1 Aug 2023 16:54:30 +0000 (UTC) X-FDA: 81076134300.29.9DF47F2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id DD7AB819EA for ; Tue, 1 Aug 2023 16:34:31 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FqsHMPFp; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.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=1690907674; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kjefxxv3ZRGBWfEsXOGOuERDMNqo6jQLqyrxh73Gpjc=; b=gMuBy1LA3Z2iJYVfoHxPzbR882lKyOU0ZhXoOoQ09ZeD6v56HRngeq/C2XYWzqQn7EtsaE F/x1ldiLSIcETu7kfULaX7mA02G3tcDCSBb+admU23W0Tf2Ow1olTSyYM61dXq1wXq+kzh VvplkOUSNyyQ2lT8fDMZ6+NK/HjYNzU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FqsHMPFp; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.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=1690907674; a=rsa-sha256; cv=none; b=VURuOtlFFAp7EE+V0VhgBTTYYmHkqoTfoBpkT1Jv1a/ihfJ1vXXfmZ5N76AMHbsdJaMfMx /OGMp9YWoyTo7RB68ccWs9A6L1Jow1pm5NDSXhsIvwZBWL4ioj+Px/T0CbSgBHdUblSNdn FMPVes52G2VPIcPSUbmWnvqTizKcC+w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690907670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kjefxxv3ZRGBWfEsXOGOuERDMNqo6jQLqyrxh73Gpjc=; b=FqsHMPFpcZjJ9FRVOpeG2kPWhq/J7hIvLU6XNvTjkf+eDR61bKM0n7vGBIeUNmYRS578X1 zBhyH0iFiP2eiH1gHQPMDOo6VaYgNOCTtpmcH+5+d9+D27j1uGh0KaPwB+9XxJlxCKTwZO PcbIgeqHIDa7CnALcKCmAI7SHd0fUdI= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-12--5fAF1HxN1yl5uZ8qPBFwA-1; Tue, 01 Aug 2023 12:34:29 -0400 X-MC-Unique: -5fAF1HxN1yl5uZ8qPBFwA-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3176fe7b67bso3153972f8f.2 for ; Tue, 01 Aug 2023 09:34:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690907668; x=1691512468; h=content-transfer-encoding:in-reply-to:organization:from:references :cc: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=kjefxxv3ZRGBWfEsXOGOuERDMNqo6jQLqyrxh73Gpjc=; b=QMUzPl1MKV+FVIWOdmkdzcrMEpWXMwQes0V8I+1dRA/CpLn1sJEXEVkrgY1Rq/PbTX Rm3E6wMTMcduPmd4cT9qlxGrqoUz23vPtlu4VzqcJdg92kD/b1fixMtWRFz4BAcTtBrC HG4VqXq2XpNthzHxBN49OtLm9PS3l9xE+8jmKcSOPkmTdX1hqWDQPwt7pJ9UcPGBzNuX xLoNu0oTXa/FGGpZMnfaaWF9qD6NrCfjmO9jhg0vi2UD7/fuII0LeqqHgf51VfhQC2+L 5KJ1d5SbG0nTS7iTEy4LNScf6u6Nw54yT4tFuDz+ZqNRAXuwAeYQACM1oRMBK11wYHJs uvDQ== X-Gm-Message-State: ABy/qLYTT/d9Ti6tUBzwmeuxZj0vD8UKhxTxHcErYux1uQOTDyaJuwCi jlAY+KqW3v/W3eNaHaze4ZzXftmKhJ9LfQo2WlI5NFxOkLSuVOuCOSqld9+9qBTbLqYG4aXMTk2 ZFEigJN2jzb0= X-Received: by 2002:adf:fdd1:0:b0:317:5b76:826 with SMTP id i17-20020adffdd1000000b003175b760826mr2809298wrs.0.1690907668489; Tue, 01 Aug 2023 09:34:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlGKWzZ6D+/xJlkeJbehIdicBnTcLOWAdOin/YiX77b1Dv3+c4jpwHuRHqkO20oah6xXgdI0yA== X-Received: by 2002:adf:fdd1:0:b0:317:5b76:826 with SMTP id i17-20020adffdd1000000b003175b760826mr2809290wrs.0.1690907668122; Tue, 01 Aug 2023 09:34:28 -0700 (PDT) Received: from ?IPV6:2003:cb:c705:d100:871b:ec55:67d:5247? (p200300cbc705d100871bec55067d5247.dip0.t-ipconnect.de. [2003:cb:c705:d100:871b:ec55:67d:5247]) by smtp.gmail.com with ESMTPSA id u5-20020a7bc045000000b003fa8dbb7b5dsm14145674wmc.25.2023.08.01.09.34.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Aug 2023 09:34:27 -0700 (PDT) Message-ID: Date: Tue, 1 Aug 2023 18:34:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH] fs/proc/kcore: reinstate bounce buffer for KCORE_TEXT regions To: Lorenzo Stoakes Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Baoquan He , Uladzislau Rezki , linux-fsdevel@vger.kernel.org, Jiri Olsa , Will Deacon , Mike Galbraith , Mark Rutland , wangkefeng.wang@huawei.com, catalin.marinas@arm.com, ardb@kernel.org, Linux regression tracking , regressions@lists.linux.dev, Matthew Wilcox , Liu Shixin , Jens Axboe , Alexander Viro , stable@vger.kernel.org References: <20230731215021.70911-1-lstoakes@gmail.com> <0af1bc20-8ba2-c6b6-64e6-c1f58d521504@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: 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: DD7AB819EA X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: dfyh45xbumsg8iiwoekm4p3wpr1m7tq6 X-HE-Tag: 1690907671-329702 X-HE-Meta: U2FsdGVkX19ghMPakfhg1KEzWaRh7K3ZD/Xmis64f+ZDcVLS0cRyL1Z9BONUCvU8FtnKUMKIv+nTvtFEiiAQ4qcVX5KA8GI39Yjb2JOMdLiOTk0XKKV78jBnqdhbbq390TlNLeTcWFF0k/uxgmLzgJihxbp5YY+YReZPAFyhea4LPaLbCiOYQexO7y7gvMW9tsq4I1vM1adWPzzE8wZMLN/pa/XOdwWuId0m5IcCBroWD2a5Twe+glg4P+jb+vDpmM/DBPGeLTx2Ov5TBvzyvGLzHU1Ge8QZKKrvlDbibqOUvzIaZ3381RCeZDXJYzt2j1WemKj9odxZhQSVksPmNa5NuqI603K/S+6LMK+uiE0ociLRrNYORqYeIuwcK7uj23G7/+j2h7k3GlcAhYGMKlWG8HtHaEO2BcEepVkVuMDsrN4vHRVzSe2nXlj18VqBVkjTmXKnYoPGiqNRs1cbnP6f3JrgGfO+6PexwvOajVmhSYlvHqawv3H4IMqszQE8G+yt+Z8vye7n9q857VPHYNHF2Wxf5jgL2gCDfeqjbsrVJl8JXRfVyNzHZhQTwkt8GevG84QRVF8u6OCinmT3vHdrULrLrFGlvz6XIVcE7W4/aR//WR83/GS6vwobnHFWSSXU1NKGQu2FcoyAOp/yp0yvYEgaEDoOFrntwCBgMVuLC4XKc6TqEQAeKzQxxOOjf6VUIumPsqWRDZLaNiTTfJ3Km+lKgLoaGApMjhUr8anfUJdCBcRV8yO/a7t6MNJdIcF1CTWxX0RkOtLAF54peZt9vVa/6gBKJOAgMWMvMT8QPyEhYqDQGhIrT2OisfvxicNLMYaEWJ08wfCHIcLorJkit9FW2wXvXDxqj/O4rD4rz0DSRuQaf55c3249tfLkJ44Jz9WUL0acX4seW1KCV5yK2Ry2A8/6wT4vBu2Og9Jsf5UtjVeyzJO4Oa5U8IdEByAMdrxGZ7hgqflhpZB 2DpREzqt rI4kTM0xEu56iULUU5Lp9T73onR8mxTy8riTFtIon/uQ+p1ay33i7THJ4TPeC/xGKCRguO0Iepf9hnQpA/042+z0hq/3E28qppj6ssKKp8b+xCjP1KeianOzKTcy6DmhylDsFFYMS7ilYyB/i2VEYiQ0S787fPm+M+332lscnE1c2mT6pvXMseJVy0fVu215shjmty2D2djonnuDbPrmMGej/3doHdDrVcPwoGNS7j5KoCbzDbxnMEPRoBzAnbLfiPcqeMNmUtwXCdeXRM5gMTl1MCOmAYNhQ79lE44r4ebhnVYvI7MeDJc8XxzKXyaeCWO5dR8962p+C3wUsjyLaHWBVp4ln4mBUB6ihO/z1GbZopn0s9sKc+fT+4UhcFooBECdUXlLRBtCSvSNevpPCRhXSUKK177oplEJkWyB4tQyOSFuj5edh4AYEQx58zFDAq3suYbY4ILGdoKtQnLJU80IdTPQbuWDoloBwNSMm3XwCgmct52hE+5tTd128k73SvgPWEz5aMGIpbTw= 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: On 01.08.23 18:33, Lorenzo Stoakes wrote: > On Tue, Aug 01, 2023 at 11:05:40AM +0200, David Hildenbrand wrote: >> On 31.07.23 23:50, Lorenzo Stoakes wrote: >>> Some architectures do not populate the entire range categorised by >>> KCORE_TEXT, so we must ensure that the kernel address we read from is >>> valid. >>> >>> Unfortunately there is no solution currently available to do so with a >>> purely iterator solution so reinstate the bounce buffer in this instance so >>> we can use copy_from_kernel_nofault() in order to avoid page faults when >>> regions are unmapped. >>> >>> This change partly reverts commit 2e1c0170771e ("fs/proc/kcore: avoid >>> bounce buffer for ktext data"), reinstating the bounce buffer, but adapts >>> the code to continue to use an iterator. >>> >>> Fixes: 2e1c0170771e ("fs/proc/kcore: avoid bounce buffer for ktext data") >>> Reported-by: Jiri Olsa >>> Closes: https://lore.kernel.org/all/ZHc2fm+9daF6cgCE@krava >>> Cc: stable@vger.kernel.org >>> Signed-off-by: Lorenzo Stoakes >>> --- >>> fs/proc/kcore.c | 26 +++++++++++++++++++++++++- >>> 1 file changed, 25 insertions(+), 1 deletion(-) >>> >>> diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c >>> index 9cb32e1a78a0..3bc689038232 100644 >>> --- a/fs/proc/kcore.c >>> +++ b/fs/proc/kcore.c >>> @@ -309,6 +309,8 @@ static void append_kcore_note(char *notes, size_t *i, const char *name, >>> static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter) >>> { >>> + struct file *file = iocb->ki_filp; >>> + char *buf = file->private_data; >>> loff_t *fpos = &iocb->ki_pos; >>> size_t phdrs_offset, notes_offset, data_offset; >>> size_t page_offline_frozen = 1; >>> @@ -554,11 +556,22 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter) >>> fallthrough; >>> case KCORE_VMEMMAP: >>> case KCORE_TEXT: >>> + /* >>> + * Sadly we must use a bounce buffer here to be able to >>> + * make use of copy_from_kernel_nofault(), as these >>> + * memory regions might not always be mapped on all >>> + * architectures. >>> + */ >>> + if (copy_from_kernel_nofault(buf, (void *)start, tsz)) { >>> + if (iov_iter_zero(tsz, iter) != tsz) { >>> + ret = -EFAULT; >>> + goto out; >>> + } >>> /* >>> * We use _copy_to_iter() to bypass usermode hardening >>> * which would otherwise prevent this operation. >>> */ >> >> Having a comment at this indentation level looks for the else case looks >> kind of weird. > > Yeah, but having it indented again would be weird and seem like it doesn't > apply to the block below, there's really no good spot for it and > checkpatch.pl doesn't mind so I think this is ok :) > >> >> (does that comment still apply?) > > Hm good point, actually, now we're using the bounce buffer we don't need to > avoid usermode hardening any more. > > However since we've established a bounce buffer ourselves its still > appropriate to use _copy_to_iter() as we know the source region is good to > copy from. > > To make life easy I'll just respin with an updated comment :) I'm not too picky this time, no need to resend if everybody else is fine :P -- Cheers, David / dhildenb