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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0529FC47DDB for ; Tue, 23 Jan 2024 17:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8bEPZ3bjXkdHvAxuTBiJQFs2VJ7J+QirGN8QRrpbjSM=; b=F6FD8gjIEx+L76 ENRmtyMsF5QLAJdiM9T+/rrtTgps6Fff3QGXIT7rZE7VoePmZiHF9KBM0vYmM7TcsJPtyS99fToTk oWoBrxfW2iWwYb+g9h1drFWvbWJZifOVppZc6MGJXe+n+k4ZVn5XiSJSpzdybFPTVwir+ENpRHz7+ z2LErAR26PAsJMc2KYStcN0rG+sfNTkRCdcMCsLnVLHu9xQtGFrTISOkPn/dEwOEHn/QW0yofeP6/ 0UE3gyhZGaNkijJcmtlrczfTpsG1hU5gSosyZyI3Kd0VUZNnzp8c7LwOe8lbWThkaOGcDeri0iqvW tpcKKYhQt6qhn9la024w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSKEK-00HQy7-01; Tue, 23 Jan 2024 17:06:32 +0000 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSKEH-00HQxA-12 for kexec@lists.infradead.org; Tue, 23 Jan 2024 17:06:31 +0000 Received: from pps.filterd (m0353728.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40NGfE81003137; Tue, 23 Jan 2024 17:03:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=cvDo4W6sOdpNY/sWyt1gM9KLEdyD3VHgiBuxWk5y72g=; b=tS7QhAIykX8PwrJN6homy8wykJdSlHYfGb1xWOCIgqMDtTwKD3ACY+Tile1Y7Ny18PEk pR4yiXHHk/mY4LQm7Zhl7AHGTpg9jLNlKXKe8h8277rvRjXhaDsjfkiFttfjPznOYNfW YBSosxR6qClKJXMSs2P5mc4AF8QrnM8/KyGWdP34wMoGH8YEolkJgcT4S5sFuizaTOV7 DM4kxG7b3A6BQruJtiHqjIuSJ81QECk6F85nnqpvOQzsbtIjsxaJfe1r1QoVoDkDPBeo x363IwN4aUWXTPsrOs0M74tXrkpmquYzi1I8uyFKMj3KzgCw9PG7bXHD5267dAaCzVSS iw== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vtbqaaf35-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jan 2024 17:03:35 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40NFqDg2022438; Tue, 23 Jan 2024 17:03:33 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vrt0m0b07-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jan 2024 17:03:33 +0000 Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40NH3X3p23855802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jan 2024 17:03:33 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6C2485805C; Tue, 23 Jan 2024 17:03:33 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D8E6E5805A; Tue, 23 Jan 2024 17:03:31 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 23 Jan 2024 17:03:31 +0000 (GMT) Message-ID: Date: Tue, 23 Jan 2024 12:03:31 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 2/7] kexec: define functions to map and unmap segments Content-Language: en-US To: Tushar Sugandhi , zohar@linux.ibm.com, roberto.sassu@huaweicloud.com, roberto.sassu@huawei.com, eric.snowberg@oracle.com, ebiederm@xmission.com, noodles@fb.com, bauermann@kolabnow.com, linux-integrity@vger.kernel.org, kexec@lists.infradead.org Cc: code@tyhicks.com, nramas@linux.microsoft.com, paul@paul-moore.com References: <20240122183804.3293904-1-tusharsu@linux.microsoft.com> <20240122183804.3293904-3-tusharsu@linux.microsoft.com> From: Stefan Berger In-Reply-To: <20240122183804.3293904-3-tusharsu@linux.microsoft.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: GIayIDHJ_gbEc-vASySdHe9dFulPM_kG X-Proofpoint-ORIG-GUID: GIayIDHJ_gbEc-vASySdHe9dFulPM_kG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-23_09,2024-01-23_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 mlxscore=0 malwarescore=0 suspectscore=0 adultscore=0 mlxlogscore=999 spamscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401230125 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240123_090629_580852_8DB4DAE4 X-CRM114-Status: GOOD ( 32.44 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org On 1/22/24 13:37, Tushar Sugandhi wrote: > Implement kimage_map_segment() to enable mapping of IMA buffer source > pages to the kimage structure post kexec 'load'. This function, > accepting a kimage pointer, an address, and a size, will gather the > source pages within the specified address range, create an array of page > pointers, and map these to a contiguous virtual address range. The > function returns the start of this range if successful, or NULL if > unsuccessful. > > Implement kimage_unmap_segment() for unmapping segments > using vunmap(). Relocate 'for_each_kimage_entry()' macro from > kexec_core.c to kexec.h for broader accessibility. > > Signed-off-by: Tushar Sugandhi > --- > include/linux/kexec.h | 13 +++++++ > kernel/kexec_core.c | 59 +++++++++++++++++++++++++++--- > security/integrity/ima/ima_kexec.c | 1 + > 3 files changed, 68 insertions(+), 5 deletions(-) > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > index 22b5cd24f581..e00b8101b53b 100644 > --- a/include/linux/kexec.h > +++ b/include/linux/kexec.h > @@ -490,6 +490,15 @@ static inline int arch_kexec_post_alloc_pages(void *vaddr, unsigned int pages, g > static inline void arch_kexec_pre_free_pages(void *vaddr, unsigned int pages) { } > #endif > > +#define for_each_kimage_entry(image, ptr, entry) \ > + for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \ > + ptr = (entry & IND_INDIRECTION) ? \ > + boot_phys_to_virt((entry & PAGE_MASK)) : ptr + 1) > + > +extern void *kimage_map_segment(struct kimage *image, > + unsigned long addr, unsigned long size); > +extern void kimage_unmap_segment(void *buffer); > + This series applies to v6.5. You may want to rebase to 6.7. > #else /* !CONFIG_KEXEC_CORE */ > struct pt_regs; > struct task_struct; > @@ -497,6 +506,10 @@ static inline void __crash_kexec(struct pt_regs *regs) { } > static inline void crash_kexec(struct pt_regs *regs) { } > static inline int kexec_should_crash(struct task_struct *p) { return 0; } > static inline int kexec_crash_loaded(void) { return 0; } > +static inline void *kimage_map_segment(struct kimage *image, > + unsigned long addr, unsigned long size) > +{ return NULL; } > +static inline void kimage_unmap_segment(void *buffer) { } > #define kexec_in_progress false > #endif /* CONFIG_KEXEC_CORE */ > > diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c > index 3d578c6fefee..26978ad02676 100644 > --- a/kernel/kexec_core.c > +++ b/kernel/kexec_core.c > @@ -594,11 +594,6 @@ void kimage_terminate(struct kimage *image) > *image->entry = IND_DONE; > } > > -#define for_each_kimage_entry(image, ptr, entry) \ > - for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \ > - ptr = (entry & IND_INDIRECTION) ? \ > - boot_phys_to_virt((entry & PAGE_MASK)) : ptr + 1) > - > static void kimage_free_entry(kimage_entry_t entry) > { > struct page *page; > @@ -921,6 +916,60 @@ int kimage_load_segment(struct kimage *image, > return result; > } > > +void *kimage_map_segment(struct kimage *image, > + unsigned long addr, unsigned long size) > +{ > + unsigned long eaddr = addr + size; > + unsigned long src_page_addr, dest_page_addr; > + unsigned int npages; > + struct page **src_pages; > + int i; > + kimage_entry_t *ptr, entry; > + void *vaddr = NULL; > + > + /* > + * Collect the source pages and map them in a contiguous VA range. > + */ > + npages = PFN_UP(eaddr) - PFN_DOWN(addr); > + src_pages = kmalloc_array(npages, sizeof(*src_pages), GFP_KERNEL); > + if (!src_pages) { > + pr_err("%s: Could not allocate ima pages array.\n", __func__); > + return NULL; > + } > + > + i = 0; > + for_each_kimage_entry(image, ptr, entry) { > + if (entry & IND_DESTINATION) > + dest_page_addr = entry & PAGE_MASK; > + else if (entry & IND_SOURCE) { > + if (dest_page_addr >= addr && dest_page_addr < eaddr) { > + src_page_addr = entry & PAGE_MASK; > + src_pages[i++] = > + virt_to_page(__va(src_page_addr)); > + if (i == npages) > + break; > + dest_page_addr += PAGE_SIZE; > + } > + } > + } > + > + /* Sanity check. */ > + WARN_ON(i < npages); > + > + vaddr = vmap(src_pages, npages, VM_MAP, PAGE_KERNEL); > + kfree(src_pages); > + > + if (!vaddr) > + pr_err("%s: Could not map imap buffer.\n", __func__); imap -> ima > + > + return vaddr; > +} > + > +void kimage_unmap_segment(void *segment_buffer) > +{ > + vunmap(segment_buffer); > +} > + > struct kexec_load_limit { > /* Mutex protects the limit count. */ > struct mutex mutex; > diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c > index 99daac355c70..4f944c9b4168 100644 > --- a/security/integrity/ima/ima_kexec.c > +++ b/security/integrity/ima/ima_kexec.c > @@ -170,6 +170,7 @@ void ima_add_kexec_buffer(struct kimage *image) > pr_debug("kexec measurement buffer for the loaded kernel at 0x%lx.\n", > kbuf.mem); > } > + remove > #endif /* IMA_KEXEC */ > > /* _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec