From nobody Tue Feb 10 23:53:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524055083404639.4672536889195; Wed, 18 Apr 2018 05:38:03 -0700 (PDT) Received: from localhost ([::1]:54093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8mLa-0004qx-Ft for importer@patchew.org; Wed, 18 Apr 2018 08:38:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8mFh-0000jv-RX for qemu-devel@nongnu.org; Wed, 18 Apr 2018 08:31:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f8mFg-0003Ib-1t for qemu-devel@nongnu.org; Wed, 18 Apr 2018 08:31:57 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34628 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f8mFf-0003IH-Sb; Wed, 18 Apr 2018 08:31:55 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7448F857EA; Wed, 18 Apr 2018 12:31:55 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-136.ams2.redhat.com [10.36.116.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id C752610F1BEE; Wed, 18 Apr 2018 12:31:53 +0000 (UTC) From: Thomas Huth To: Christian Borntraeger , qemu-s390x@nongnu.org, Viktor Mihajlovski Date: Wed, 18 Apr 2018 14:31:46 +0200 Message-Id: <1524054707-20663-4-git-send-email-thuth@redhat.com> In-Reply-To: <1524054707-20663-1-git-send-email-thuth@redhat.com> References: <1524054707-20663-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 18 Apr 2018 12:31:55 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 18 Apr 2018 12:31:55 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v1 for-2.13 3/4] pc-bios/s390-ccw/net: Add support for pxelinux-style config files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Collin Walling , Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since it is quite cumbersome to manually create a combined kernel with initrd image for network booting, we now support loading via pxelinux configuration files, too. In these files, the kernel, initrd and command line parameters can be specified seperately, and the firmware then takes care of glueing everything together in memory after the files have been downloaded. Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/netboot.mak | 5 +- pc-bios/s390-ccw/netmain.c | 203 +++++++++++++++++++++++++++++++++++++++= ++-- 2 files changed, 201 insertions(+), 7 deletions(-) diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak index a25d238..8db9573 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak @@ -24,8 +24,9 @@ CTYPE_OBJS =3D isdigit.o isxdigit.o toupper.o %.o : $(SLOF_DIR)/lib/libc/ctype/%.c $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)= $@") =20 -STRING_OBJS =3D strcat.o strchr.o strcmp.o strcpy.o strlen.o strncmp.o str= ncpy.o \ - strstr.o memset.o memcpy.o memmove.o memcmp.o +STRING_OBJS =3D strcasecmp.o strcat.o strchr.o strcmp.o strcpy.o strlen.o \ + strncasecmp.o strncmp.o strncpy.o strstr.o \ + memset.o memcpy.o memmove.o memcmp.o %.o : $(SLOF_DIR)/lib/libc/string/%.c $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)= $@") =20 diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c index e11ed4e..fa62bfe 100644 --- a/pc-bios/s390-ccw/netmain.c +++ b/pc-bios/s390-ccw/netmain.c @@ -39,11 +39,17 @@ =20 extern char _start[]; =20 +#define KERNEL_ADDR ((void *)0L) +#define KERNEL_MAX_SIZE ((long)_start) +#define ARCH_COMMAND_LINE_SIZE 896 /* Taken from Linux kerne= l */ + char stack[PAGE_SIZE * 8] __attribute__((aligned(PAGE_SIZE))); IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE))); +static char cfgbuf[2048]; =20 static SubChannelId net_schid =3D { .one =3D 1 }; static int ip_version =3D 4; +static uint8_t mac[6]; static uint64_t dest_timer; =20 static uint64_t get_timer_ms(void) @@ -136,9 +142,15 @@ static int tftp_load(filename_ip_t *fnip, void *buffer= , int len) rc =3D tftp(fnip, buffer, len, DEFAULT_TFTP_RETRIES, &tftp_err, 1, 142= 8, ip_version); =20 - if (rc > 0) { - printf(" TFTP: Received %s (%d KBytes)\n", fnip->filename, - rc / 1024); + if (rc < 0) { + /* Make sure that error messages are put into a new line */ + printf("\n "); + } + + if (rc > 1024) { + printf(" TFTP: Received %s (%d KBytes)\n", fnip->filename, rc / 1= 024); + } else if (rc > 0) { + printf(" TFTP: Received %s (%d Bytes)\n", fnip->filename, rc); } else if (rc =3D=3D -1) { puts("unknown TFTP error"); } else if (rc =3D=3D -2) { @@ -201,7 +213,6 @@ static int tftp_load(filename_ip_t *fnip, void *buffer,= int len) =20 static int net_init(filename_ip_t *fn_ip) { - uint8_t mac[6]; int rc; =20 memset(fn_ip, 0, sizeof(filename_ip_t)); @@ -276,6 +287,183 @@ static void net_uninit(filename_ip_t *fn_ip) virtio_net_uninit(); } =20 +/* This structure holds the data from one pxelinux.cfg file entry */ +struct lkia { + const char *label; + const char *kernel; + const char *initrd; + const char *append; +}; + +static int load_kernel_with_initrd(filename_ip_t *fn_ip, struct lkia *kia) +{ + int rc; + + printf("Loading pxelinux.cfg entry '%s'\n", kia->label); + + if (!kia->kernel) { + printf("Kernel entry is missing!\n"); + return -1; + } + + strncpy((char *)&fn_ip->filename, kia->kernel, sizeof(fn_ip->filename)= ); + rc =3D tftp_load(fn_ip, KERNEL_ADDR, KERNEL_MAX_SIZE); + if (rc < 0) { + return rc; + } + + if (kia->initrd) { + uint64_t iaddr =3D (rc + 0xfff) & ~0xfffUL; + + strncpy((char *)&fn_ip->filename, kia->initrd, sizeof(fn_ip->filen= ame)); + rc =3D tftp_load(fn_ip, (void *)iaddr, KERNEL_MAX_SIZE - iaddr); + if (rc < 0) { + return rc; + } + /* Patch location and size: */ + *(uint64_t *)0x10408 =3D iaddr; + *(uint64_t *)0x10410 =3D rc; + rc +=3D iaddr; + } + + if (kia->append) { + strncpy((char *)0x10480, kia->append, ARCH_COMMAND_LINE_SIZE); + } + + return rc; +} + +#define MAX_PXELINUX_ENTRIES 16 + +/** + * Parse a pxelinux-style configuration file. + * See the following URL for more inforation about the config file syntax: + * https://www.syslinux.org/wiki/index.php?title=3DPXELINUX + */ +static int handle_pxelinux_cfg(filename_ip_t *fn_ip, char *cfg, int cfgsiz= e) +{ + struct lkia entries[MAX_PXELINUX_ENTRIES]; + int num_entries =3D 0; + char *ptr =3D cfg, *eol, *arg; + char *defaultlabel =3D NULL; + int def_ent =3D 0; + + while (ptr < cfg + cfgsize && num_entries < MAX_PXELINUX_ENTRIES) { + eol =3D strchr(ptr, '\n'); + if (!eol) { + eol =3D cfg + cfgsize; + } + if (eol > ptr && *(eol - 1) =3D=3D '\r') { + *(eol - 1) =3D 0; + } + *eol =3D '\0'; + while (*ptr =3D=3D ' ' || *ptr =3D=3D '\t') { + ptr++; + } + if (*ptr =3D=3D 0 || *ptr =3D=3D '#') { /* Ignore comments and e= mpty lines */ + goto nextline; + } + arg =3D strchr(ptr, ' '); /* Look for space between command and= arg */ + if (!arg) { + arg =3D strchr(ptr, '\t'); + } + if (!arg) { + printf("Failed to parse the following line:\n %s\n", ptr); + goto nextline; + } + *arg++ =3D 0; + while (*arg =3D=3D ' ' || *arg =3D=3D '\t') { + arg++; + } + if (!strcasecmp("default", ptr)) { + defaultlabel =3D arg; + } else if (!strcasecmp("label", ptr)) { + entries[num_entries].label =3D arg; + if (defaultlabel && !strcmp(arg, defaultlabel)) { + def_ent =3D num_entries; + } + num_entries++; + } else if (!strcasecmp("kernel", ptr)) { + entries[num_entries - 1].kernel =3D arg; + } else if (!strcasecmp("initrd", ptr)) { + entries[num_entries - 1].initrd =3D arg; + } else if (!strcasecmp("append", ptr)) { + entries[num_entries - 1].append =3D arg; + } else { + printf("Command '%s' is not supported.\n", ptr); + } +nextline: + ptr =3D eol + 1; + } + + return load_kernel_with_initrd(fn_ip, &entries[def_ent]); +} + +static int net_try_pxelinux_cfgs(filename_ip_t *fn_ip) +{ + int rc, idx; + + cfgbuf[sizeof(cfgbuf) - 1] =3D 0; /* Make sure that it is NUL-termin= ated */ + + printf("Trying pxelinux.cfg files...\n"); + + /* Look for config file with MAC address in its name */ + sprintf((char *)fn_ip->filename, + "pxelinux.cfg/%02x-%02x-%02x-%02x-%02x-%02x", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + rc =3D tftp_load(fn_ip, cfgbuf, sizeof(cfgbuf) - 1); + if (rc > 0) { + return handle_pxelinux_cfg(fn_ip, cfgbuf, sizeof(cfgbuf)); + } + + /* Look for config file with IP address in its name */ + if (ip_version =3D=3D 4) { + for (idx =3D 0; idx <=3D 7; idx++) { + sprintf((char *)fn_ip->filename, + "pxelinux.cfg/%02X%02X%02X%02X", + (fn_ip->own_ip >> 24) & 0xff, (fn_ip->own_ip >> 16) & = 0xff, + (fn_ip->own_ip >> 8) & 0xff, fn_ip->own_ip & 0xff); + fn_ip->filename[strlen((char *)fn_ip->filename) - idx] =3D 0; + rc =3D tftp_load(fn_ip, cfgbuf, sizeof(cfgbuf) - 1); + if (rc > 0) { + return handle_pxelinux_cfg(fn_ip, cfgbuf, sizeof(cfgbuf)); + } + } + } + + /* Try "default" config file */ + strcpy((char *)fn_ip->filename, "pxelinux.cfg/default"); + rc =3D tftp_load(fn_ip, cfgbuf, sizeof(cfgbuf) - 1); + if (rc > 0) { + return handle_pxelinux_cfg(fn_ip, cfgbuf, sizeof(cfgbuf)); + } + + return -1; +} + +static int net_try_direct_tftp_load(filename_ip_t *fn_ip) +{ + int rc; + void *baseaddr =3D (void *)0x2000; /* Load right after the low-core */ + + rc =3D tftp_load(fn_ip, baseaddr, KERNEL_MAX_SIZE - (long)baseaddr); + + if (rc > 0 && rc < sizeof(cfgbuf) - 1) { + /* Check whether it is a configuration file instead of a kernel */ + memcpy(cfgbuf, baseaddr, rc); + cfgbuf[rc] =3D 0; /* Make sure that it is NUL-terminated */ + if (!strncasecmp("default", cfgbuf, 7) || !strncmp("# ", cfgbuf, 2= )) { + /* Looks like it is a pxelinux.cfg */ + return handle_pxelinux_cfg(fn_ip, cfgbuf, rc); + } + } + + /* Move kernel to right location */ + memmove(KERNEL_ADDR, baseaddr, rc); + + return rc; +} + void panic(const char *string) { sclp_print(string); @@ -360,7 +548,12 @@ void main(void) panic("Network initialization failed. Halting.\n"); } =20 - rc =3D tftp_load(&fn_ip, NULL, (long)_start); + if (strlen((char *)fn_ip.filename) > 0) { + rc =3D net_try_direct_tftp_load(&fn_ip); + } + if (rc <=3D 0) { + rc =3D net_try_pxelinux_cfgs(&fn_ip); + } =20 net_uninit(&fn_ip); =20 --=20 1.8.3.1