From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: kexec@lists.infradead.org, linux-security-module@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, x86@kernel.org, Eric Biederman <ebiederm@xmission.com>, Dave Young <dyoung@redhat.com>, Vivek Goyal <vgoyal@redhat.com>, Baoquan He <bhe@redhat.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Stewart Smith <stewart@linux.vnet.ibm.com>, Samuel Mendoza-Jonas <sam@mendozajonas.com>, Mimi Zohar <zohar@linux.vnet.ibm.com>, Eric Richter <erichte@linux.vnet.ibm.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, Petko Manolov <petkan@mip-labs.com>, David Laight <David.Laight@aculab.com>, Balbir Singh <bsingharora@gmail.com> Subject: Re: [PATCH v2 4/6] kexec_file: Add mechanism to update kexec segments. Date: Tue, 16 Aug 2016 14:00:31 -0300 [thread overview] Message-ID: <1734678.Uaq7DTajoE@hactar> (raw) In-Reply-To: <20160815152756.78ea7a61a3342547b9e694e5@linux-foundation.org> Hello Andrew, Thank you for your review! Am Montag, 15 August 2016, 15:27:56 schrieb Andrew Morton: > On Sat, 13 Aug 2016 00:18:23 -0300 Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> wrote: > > +/** > > + * kexec_update_segment - update the contents of a kimage segment > > + * @buffer: New contents of the segment. > > + * @bufsz: @buffer size. > > + * @load_addr: Segment's physical address in the next kernel. > > + * @memsz: Segment size. > > + * > > + * This function assumes kexec_mutex is held. > > + * > > + * Return: 0 on success, negative errno on error. > > + */ > > +int kexec_update_segment(const char *buffer, unsigned long bufsz, > > + unsigned long load_addr, unsigned long memsz) > > +{ > > + int i; > > + unsigned long entry; > > + unsigned long *ptr = NULL; > > + void *dest = NULL; > > + > > + if (kexec_image == NULL) { > > + pr_err("Can't update segment: no kexec image loaded.\n"); > > + return -EINVAL; > > + } > > + > > + /* > > + * kexec_add_buffer rounds up segment sizes to PAGE_SIZE, so > > + * we have to do it here as well. > > + */ > > + memsz = ALIGN(memsz, PAGE_SIZE); > > + > > + for (i = 0; i < kexec_image->nr_segments; i++) > > + /* We only support updating whole segments. */ > > + if (load_addr == kexec_image->segment[i].mem && > > + memsz == kexec_image->segment[i].memsz) { > > + if (kexec_image->segment[i].do_checksum) { > > + pr_err("Trying to update non-modifiable segment.\n"); > > + return -EINVAL; > > + } > > + > > + break; > > + } > > + if (i == kexec_image->nr_segments) { > > + pr_err("Couldn't find segment to update: 0x%lx, size 0x%lx\n", > > + load_addr, memsz); > > + return -EINVAL; > > + } > > + > > + for (entry = kexec_image->head; !(entry & IND_DONE) && memsz; > > + entry = *ptr++) { > > + void *addr = (void *) (entry & PAGE_MASK); > > + > > + switch (entry & IND_FLAGS) { > > + case IND_DESTINATION: > > + dest = addr; > > + break; > > + case IND_INDIRECTION: > > + ptr = __va(addr); > > + break; > > + case IND_SOURCE: > > + /* Shouldn't happen, but verify just to be safe. */ > > + if (dest == NULL) { > > + pr_err("Invalid kexec entries list."); > > + return -EINVAL; > > + } > > + > > + if (dest == (void *) load_addr) { > > + struct page *page; > > + char *ptr; > > + size_t uchunk, mchunk; > > + > > + page = kmap_to_page(addr); > > + > > + ptr = kmap(page); > > kmap_atomic() could be used here, and it is appreciably faster. Good idea. The patch below implements your suggestion. This has a consequence for patch 5/6 in this series, because it makes this code be used in the path of the kexec_file_load and kexec_load syscalls. In the latter case, there's a call to copy_from_user and thus kmap_atomic can't be used. I can change the patch to use kmap_atomic if state->from_kernel is true and kmap otherwise, but perhaps this is one more hint that patch 5/6 is not a very good idea after all. -- []'s Thiago Jung Bauermann IBM Linux Technology Center Subject: [PATCH v2 4/6] kexec_file: Add mechanism to update kexec segments. kexec_update_segment allows a given segment in kexec_image to have its contents updated. This is useful if the current kernel wants to send information to the next kernel that is up-to-date at the time of reboot. Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> --- include/linux/kexec.h | 2 ++ kernel/kexec_core.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 37eea32fdff1..14dda81e3e01 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -259,6 +259,8 @@ extern int kexec_purgatory_get_set_symbol(struct kimage *image, unsigned int size, bool get_value); extern void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name); +int kexec_update_segment(const char *buffer, unsigned long bufsz, + unsigned long load_addr, unsigned long memsz); extern void __crash_kexec(struct pt_regs *); extern void crash_kexec(struct pt_regs *); int kexec_should_crash(struct task_struct *); diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 561675589511..9782b292714e 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -721,6 +721,105 @@ static struct page *kimage_alloc_page(struct kimage *image, return page; } +/** + * kexec_update_segment - update the contents of a kimage segment + * @buffer: New contents of the segment. + * @bufsz: @buffer size. + * @load_addr: Segment's physical address in the next kernel. + * @memsz: Segment size. + * + * This function assumes kexec_mutex is held. + * + * Return: 0 on success, negative errno on error. + */ +int kexec_update_segment(const char *buffer, unsigned long bufsz, + unsigned long load_addr, unsigned long memsz) +{ + int i; + unsigned long entry; + unsigned long *ptr = NULL; + void *dest = NULL; + + if (kexec_image == NULL) { + pr_err("Can't update segment: no kexec image loaded.\n"); + return -EINVAL; + } + + /* + * kexec_add_buffer rounds up segment sizes to PAGE_SIZE, so + * we have to do it here as well. + */ + memsz = ALIGN(memsz, PAGE_SIZE); + + for (i = 0; i < kexec_image->nr_segments; i++) + /* We only support updating whole segments. */ + if (load_addr == kexec_image->segment[i].mem && + memsz == kexec_image->segment[i].memsz) { + if (kexec_image->segment[i].do_checksum) { + pr_err("Trying to update non-modifiable segment.\n"); + return -EINVAL; + } + + break; + } + if (i == kexec_image->nr_segments) { + pr_err("Couldn't find segment to update: 0x%lx, size 0x%lx\n", + load_addr, memsz); + return -EINVAL; + } + + for (entry = kexec_image->head; !(entry & IND_DONE) && memsz; + entry = *ptr++) { + void *addr = (void *) (entry & PAGE_MASK); + + switch (entry & IND_FLAGS) { + case IND_DESTINATION: + dest = addr; + break; + case IND_INDIRECTION: + ptr = __va(addr); + break; + case IND_SOURCE: + /* Shouldn't happen, but verify just to be safe. */ + if (dest == NULL) { + pr_err("Invalid kexec entries list."); + return -EINVAL; + } + + if (dest == (void *) load_addr) { + struct page *page; + char *ptr; + size_t uchunk, mchunk; + + page = kmap_to_page(addr); + + ptr = kmap_atomic(page); + ptr += load_addr & ~PAGE_MASK; + mchunk = min_t(size_t, memsz, + PAGE_SIZE - (load_addr & ~PAGE_MASK)); + uchunk = min(bufsz, mchunk); + memcpy(ptr, buffer, uchunk); + + kunmap_atomic(ptr); + + bufsz -= uchunk; + load_addr += mchunk; + buffer += mchunk; + memsz -= mchunk; + } + dest += PAGE_SIZE; + } + + /* Shouldn't happen, but verify just to be safe. */ + if (ptr == NULL) { + pr_err("Invalid kexec entries list."); + return -EINVAL; + } + } + + return 0; +} + static int kimage_load_normal_segment(struct kimage *image, struct kexec_segment *segment) { -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Balbir Singh <bsingharora@gmail.com>, Paul Mackerras <paulus@samba.org>, "H. Peter Anvin" <hpa@zytor.com>, linux-ima-devel@lists.sourceforge.net, Stewart Smith <stewart@linux.vnet.ibm.com>, Baoquan He <bhe@redhat.com>, Michael Ellerman <mpe@ellerman.id.au>, x86@kernel.org, Ingo Molnar <mingo@redhat.com>, Mimi Zohar <zohar@linux.vnet.ibm.com>, Vivek Goyal <vgoyal@redhat.com>, Petko Manolov <petkan@mip-labs.com>, Thomas Gleixner <tglx@linutronix.de>, Eric Richter <erichte@linux.vnet.ibm.com>, Dave Young <dyoung@redhat.com>, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, David Laight <David.Laight@aculab.com>, Eric Biederman <ebiederm@xmission.com>, Samuel Mendoza-Jonas <sam@mendozajonas.com>, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v2 4/6] kexec_file: Add mechanism to update kexec segments. Date: Tue, 16 Aug 2016 14:00:31 -0300 [thread overview] Message-ID: <1734678.Uaq7DTajoE@hactar> (raw) In-Reply-To: <20160815152756.78ea7a61a3342547b9e694e5@linux-foundation.org> Hello Andrew, Thank you for your review! Am Montag, 15 August 2016, 15:27:56 schrieb Andrew Morton: > On Sat, 13 Aug 2016 00:18:23 -0300 Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> wrote: > > +/** > > + * kexec_update_segment - update the contents of a kimage segment > > + * @buffer: New contents of the segment. > > + * @bufsz: @buffer size. > > + * @load_addr: Segment's physical address in the next kernel. > > + * @memsz: Segment size. > > + * > > + * This function assumes kexec_mutex is held. > > + * > > + * Return: 0 on success, negative errno on error. > > + */ > > +int kexec_update_segment(const char *buffer, unsigned long bufsz, > > + unsigned long load_addr, unsigned long memsz) > > +{ > > + int i; > > + unsigned long entry; > > + unsigned long *ptr = NULL; > > + void *dest = NULL; > > + > > + if (kexec_image == NULL) { > > + pr_err("Can't update segment: no kexec image loaded.\n"); > > + return -EINVAL; > > + } > > + > > + /* > > + * kexec_add_buffer rounds up segment sizes to PAGE_SIZE, so > > + * we have to do it here as well. > > + */ > > + memsz = ALIGN(memsz, PAGE_SIZE); > > + > > + for (i = 0; i < kexec_image->nr_segments; i++) > > + /* We only support updating whole segments. */ > > + if (load_addr == kexec_image->segment[i].mem && > > + memsz == kexec_image->segment[i].memsz) { > > + if (kexec_image->segment[i].do_checksum) { > > + pr_err("Trying to update non-modifiable segment.\n"); > > + return -EINVAL; > > + } > > + > > + break; > > + } > > + if (i == kexec_image->nr_segments) { > > + pr_err("Couldn't find segment to update: 0x%lx, size 0x%lx\n", > > + load_addr, memsz); > > + return -EINVAL; > > + } > > + > > + for (entry = kexec_image->head; !(entry & IND_DONE) && memsz; > > + entry = *ptr++) { > > + void *addr = (void *) (entry & PAGE_MASK); > > + > > + switch (entry & IND_FLAGS) { > > + case IND_DESTINATION: > > + dest = addr; > > + break; > > + case IND_INDIRECTION: > > + ptr = __va(addr); > > + break; > > + case IND_SOURCE: > > + /* Shouldn't happen, but verify just to be safe. */ > > + if (dest == NULL) { > > + pr_err("Invalid kexec entries list."); > > + return -EINVAL; > > + } > > + > > + if (dest == (void *) load_addr) { > > + struct page *page; > > + char *ptr; > > + size_t uchunk, mchunk; > > + > > + page = kmap_to_page(addr); > > + > > + ptr = kmap(page); > > kmap_atomic() could be used here, and it is appreciably faster. Good idea. The patch below implements your suggestion. This has a consequence for patch 5/6 in this series, because it makes this code be used in the path of the kexec_file_load and kexec_load syscalls. In the latter case, there's a call to copy_from_user and thus kmap_atomic can't be used. I can change the patch to use kmap_atomic if state->from_kernel is true and kmap otherwise, but perhaps this is one more hint that patch 5/6 is not a very good idea after all. -- []'s Thiago Jung Bauermann IBM Linux Technology Center Subject: [PATCH v2 4/6] kexec_file: Add mechanism to update kexec segments. kexec_update_segment allows a given segment in kexec_image to have its contents updated. This is useful if the current kernel wants to send information to the next kernel that is up-to-date at the time of reboot. Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> --- include/linux/kexec.h | 2 ++ kernel/kexec_core.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 37eea32fdff1..14dda81e3e01 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -259,6 +259,8 @@ extern int kexec_purgatory_get_set_symbol(struct kimage *image, unsigned int size, bool get_value); extern void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name); +int kexec_update_segment(const char *buffer, unsigned long bufsz, + unsigned long load_addr, unsigned long memsz); extern void __crash_kexec(struct pt_regs *); extern void crash_kexec(struct pt_regs *); int kexec_should_crash(struct task_struct *); diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 561675589511..9782b292714e 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -721,6 +721,105 @@ static struct page *kimage_alloc_page(struct kimage *image, return page; } +/** + * kexec_update_segment - update the contents of a kimage segment + * @buffer: New contents of the segment. + * @bufsz: @buffer size. + * @load_addr: Segment's physical address in the next kernel. + * @memsz: Segment size. + * + * This function assumes kexec_mutex is held. + * + * Return: 0 on success, negative errno on error. + */ +int kexec_update_segment(const char *buffer, unsigned long bufsz, + unsigned long load_addr, unsigned long memsz) +{ + int i; + unsigned long entry; + unsigned long *ptr = NULL; + void *dest = NULL; + + if (kexec_image == NULL) { + pr_err("Can't update segment: no kexec image loaded.\n"); + return -EINVAL; + } + + /* + * kexec_add_buffer rounds up segment sizes to PAGE_SIZE, so + * we have to do it here as well. + */ + memsz = ALIGN(memsz, PAGE_SIZE); + + for (i = 0; i < kexec_image->nr_segments; i++) + /* We only support updating whole segments. */ + if (load_addr == kexec_image->segment[i].mem && + memsz == kexec_image->segment[i].memsz) { + if (kexec_image->segment[i].do_checksum) { + pr_err("Trying to update non-modifiable segment.\n"); + return -EINVAL; + } + + break; + } + if (i == kexec_image->nr_segments) { + pr_err("Couldn't find segment to update: 0x%lx, size 0x%lx\n", + load_addr, memsz); + return -EINVAL; + } + + for (entry = kexec_image->head; !(entry & IND_DONE) && memsz; + entry = *ptr++) { + void *addr = (void *) (entry & PAGE_MASK); + + switch (entry & IND_FLAGS) { + case IND_DESTINATION: + dest = addr; + break; + case IND_INDIRECTION: + ptr = __va(addr); + break; + case IND_SOURCE: + /* Shouldn't happen, but verify just to be safe. */ + if (dest == NULL) { + pr_err("Invalid kexec entries list."); + return -EINVAL; + } + + if (dest == (void *) load_addr) { + struct page *page; + char *ptr; + size_t uchunk, mchunk; + + page = kmap_to_page(addr); + + ptr = kmap_atomic(page); + ptr += load_addr & ~PAGE_MASK; + mchunk = min_t(size_t, memsz, + PAGE_SIZE - (load_addr & ~PAGE_MASK)); + uchunk = min(bufsz, mchunk); + memcpy(ptr, buffer, uchunk); + + kunmap_atomic(ptr); + + bufsz -= uchunk; + load_addr += mchunk; + buffer += mchunk; + memsz -= mchunk; + } + dest += PAGE_SIZE; + } + + /* Shouldn't happen, but verify just to be safe. */ + if (ptr == NULL) { + pr_err("Invalid kexec entries list."); + return -EINVAL; + } + } + + return 0; +} + static int kimage_load_normal_segment(struct kimage *image, struct kexec_segment *segment) { -- 1.9.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2016-08-16 17:00 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-13 3:18 [PATCH v2 0/6] kexec_file: Add buffer hand-over for the next kernel Thiago Jung Bauermann 2016-08-13 3:18 ` Thiago Jung Bauermann 2016-08-13 3:18 ` [PATCH v2 1/6] kexec_file: Add buffer hand-over support " Thiago Jung Bauermann 2016-08-13 3:18 ` Thiago Jung Bauermann 2016-08-13 3:18 ` [PATCH v2 2/6] powerpc: " Thiago Jung Bauermann 2016-08-13 3:18 ` Thiago Jung Bauermann 2016-08-22 3:21 ` Dave Young 2016-08-22 3:21 ` Dave Young 2016-08-22 3:38 ` Thiago Jung Bauermann 2016-08-22 3:38 ` Thiago Jung Bauermann 2016-08-22 7:22 ` Dave Young 2016-08-22 7:22 ` Dave Young 2016-08-22 22:21 ` Thiago Jung Bauermann 2016-08-22 22:21 ` Thiago Jung Bauermann 2016-08-13 3:18 ` [PATCH v2 3/6] kexec_file: Allow skipping checksum calculation for some segments Thiago Jung Bauermann 2016-08-13 3:18 ` Thiago Jung Bauermann 2016-08-18 9:03 ` Dave Young 2016-08-18 9:03 ` Dave Young 2016-08-18 21:09 ` Thiago Jung Bauermann 2016-08-18 21:09 ` Thiago Jung Bauermann 2016-08-22 3:17 ` Dave Young 2016-08-22 3:17 ` Dave Young 2016-08-22 3:25 ` Thiago Jung Bauermann 2016-08-22 3:25 ` Thiago Jung Bauermann 2016-08-22 3:36 ` Dave Young 2016-08-22 3:36 ` Dave Young 2016-08-22 3:45 ` Thiago Jung Bauermann 2016-08-22 3:45 ` Thiago Jung Bauermann 2016-08-22 22:12 ` Thiago Jung Bauermann 2016-08-22 22:12 ` Thiago Jung Bauermann 2016-08-13 3:18 ` [PATCH v2 4/6] kexec_file: Add mechanism to update kexec segments Thiago Jung Bauermann 2016-08-13 3:18 ` Thiago Jung Bauermann 2016-08-15 22:27 ` Andrew Morton 2016-08-15 22:27 ` Andrew Morton 2016-08-16 17:00 ` Thiago Jung Bauermann [this message] 2016-08-16 17:00 ` Thiago Jung Bauermann 2016-08-13 3:18 ` [PATCH v2 5/6] kexec: Share logic to copy segment page contents Thiago Jung Bauermann 2016-08-13 3:18 ` Thiago Jung Bauermann 2016-08-13 3:18 ` [PATCH v2 6/6] IMA: Demonstration code for kexec buffer passing Thiago Jung Bauermann 2016-08-13 3:18 ` Thiago Jung Bauermann 2016-08-17 2:52 ` [PATCH v2 0/6] kexec_file: Add buffer hand-over for the next kernel Dave Young 2016-08-17 2:52 ` Dave Young 2016-08-17 4:58 ` Thiago Jung Bauermann 2016-08-17 4:58 ` Thiago Jung Bauermann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1734678.Uaq7DTajoE@hactar \ --to=bauerman@linux.vnet.ibm.com \ --cc=David.Laight@aculab.com \ --cc=akpm@linux-foundation.org \ --cc=benh@kernel.crashing.org \ --cc=bhe@redhat.com \ --cc=bsingharora@gmail.com \ --cc=dyoung@redhat.com \ --cc=ebiederm@xmission.com \ --cc=erichte@linux.vnet.ibm.com \ --cc=hpa@zytor.com \ --cc=kexec@lists.infradead.org \ --cc=linux-ima-devel@lists.sourceforge.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.org \ --cc=petkan@mip-labs.com \ --cc=sam@mendozajonas.com \ --cc=stewart@linux.vnet.ibm.com \ --cc=tglx@linutronix.de \ --cc=vgoyal@redhat.com \ --cc=x86@kernel.org \ --cc=zohar@linux.vnet.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.