* [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS
@ 2017-07-07 10:26 Thomas Huth
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
` (7 more replies)
0 siblings, 8 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:26 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
It's already possible to do a network boot of an s390x guest with an
external netboot image based on a Linux installation, but it would
be much more convenient if the s390-ccw firmware supported network
booting right out of the box, without the need to assemble such an
external image first.
This patch series now introduces a s390-netboot.img that can be used
for network booting via DHCP and TFTP by re-using the networking stack
from the SLOF firmware (see https://github.com/aik/SLOF/ for details),
and adds a driver for virtio-net-ccw devices.
The code can only be built if the roms/SLOF/ submodule has been checked
out, and you apply the following pending SLOF patch on top of it:
https://patchwork.ozlabs.org/patch/785384/
Then it should be possible to download a combined kernel + initrd
image via TFTP, e.g. by starting QEMU with:
qemu-system-s390x ... -device virtio-net,netdev=n1,bootindex=1 \
-netdev user,id=n1,tftp=/path/to/tftp,bootfile=kernel.img
Note that this version does not support downloading via config
files (i.e. pxelinux config files or .INS config files) yet. This
will be added later.
v2:
- Put the network boot loader into a separate s390-netboot.img
binary instead of linking it directly into the s390-ccw firmware.
- Use the SLOF sources from the roms/SLOF/ submodule instead of
copying them into the pc-bios/s390-ccw folder
- Removed the .INS config file loading code for now - only support
combined kernel + initrd images in this initial implementation.
Thomas Huth (8):
pc-bios/s390-ccw: Move libc functions to separate header
pc-bios/s390-ccw: Move ebc2asc to sclp.c
pc-bios/s390-ccw: Move virtio-block related functions into a separate
file
pc-bios/s390-ccw: Add a write() function for stdio
roms/SLOF: Update submodule to latest status
pc-bios/s390-ccw: Add core files for the network bootloading program
pc-bios/s390-ccw: Add virtio-net driver code
pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP
load
pc-bios/s390-ccw/Makefile | 13 +-
pc-bios/s390-ccw/bootmap.c | 1 +
pc-bios/s390-ccw/libc.h | 43 +++++
pc-bios/s390-ccw/main.c | 14 +-
pc-bios/s390-ccw/netboot.mak | 51 ++++++
pc-bios/s390-ccw/netmain.c | 365 +++++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/s390-ccw.h | 31 +---
pc-bios/s390-ccw/sclp.c | 37 +++--
pc-bios/s390-ccw/virtio-blk.c | 296 +++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/virtio-net.c | 130 +++++++++++++++
pc-bios/s390-ccw/virtio-scsi.c | 1 +
pc-bios/s390-ccw/virtio.c | 283 ++------------------------------
pc-bios/s390-ccw/virtio.h | 17 +-
roms/SLOF | 2 +-
14 files changed, 955 insertions(+), 329 deletions(-)
create mode 100644 pc-bios/s390-ccw/libc.h
create mode 100644 pc-bios/s390-ccw/netboot.mak
create mode 100644 pc-bios/s390-ccw/netmain.c
create mode 100644 pc-bios/s390-ccw/virtio-blk.c
create mode 100644 pc-bios/s390-ccw/virtio-net.c
--
1.8.3.1
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
@ 2017-07-07 10:26 ` Thomas Huth
2017-07-07 13:46 ` Christian Borntraeger
2017-07-07 13:56 ` Farhan Ali
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
` (6 subsequent siblings)
7 siblings, 2 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:26 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
The upcoming netboot code will use the libc from SLOF. To be able
to still use s390-ccw.h there, the libc related functions in this
header have to be moved to a different location.
And while we're at it, remove the duplicate memcpy() function from
sclp.c.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/bootmap.c | 1 +
pc-bios/s390-ccw/libc.h | 43 ++++++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/main.c | 1 +
pc-bios/s390-ccw/s390-ccw.h | 29 ----------------------------
pc-bios/s390-ccw/sclp.c | 10 ++--------
pc-bios/s390-ccw/virtio-scsi.c | 1 +
pc-bios/s390-ccw/virtio.c | 1 +
7 files changed, 49 insertions(+), 37 deletions(-)
create mode 100644 pc-bios/s390-ccw/libc.h
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 523fa78..458d3da 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "bootmap.h"
#include "virtio.h"
diff --git a/pc-bios/s390-ccw/libc.h b/pc-bios/s390-ccw/libc.h
new file mode 100644
index 0000000..9076bb7
--- /dev/null
+++ b/pc-bios/s390-ccw/libc.h
@@ -0,0 +1,43 @@
+/*
+ * libc-style definitions and functions
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#ifndef S390_CCW_LIBC_H
+#define S390_CCW_LIBC_H
+
+typedef long size_t;
+typedef int bool;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
+
+static inline void *memset(void *s, int c, size_t n)
+{
+ int i;
+ unsigned char *p = s;
+
+ for (i = 0; i < n; i++) {
+ p[i] = c;
+ }
+
+ return s;
+}
+
+static inline void *memcpy(void *s1, const void *s2, size_t n)
+{
+ uint8_t *p1 = s1;
+ const uint8_t *p2 = s2;
+
+ while (n--) {
+ p1[n] = p2[n];
+ }
+ return s1;
+}
+
+#endif
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 1cacc1b..40cba8d 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "virtio.h"
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 2089274..43e2d42 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -18,12 +18,6 @@ typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long long u64;
typedef unsigned long ulong;
-typedef long size_t;
-typedef int bool;
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
typedef unsigned char __u8;
typedef unsigned short __u16;
typedef unsigned int __u32;
@@ -88,18 +82,6 @@ ulong get_second(void);
/* bootmap.c */
void zipl_load(void);
-static inline void *memset(void *s, int c, size_t n)
-{
- int i;
- unsigned char *p = s;
-
- for (i = 0; i < n; i++) {
- p[i] = c;
- }
-
- return s;
-}
-
static inline void fill_hex(char *out, unsigned char val)
{
const char hex[] = "0123456789abcdef";
@@ -169,17 +151,6 @@ static inline void sleep(unsigned int seconds)
}
}
-static inline void *memcpy(void *s1, const void *s2, size_t n)
-{
- uint8_t *p1 = s1;
- const uint8_t *p2 = s2;
-
- while (n--) {
- p1[n] = p2[n];
- }
- return s1;
-}
-
static inline void IPL_assert(bool term, const char *message)
{
if (!term) {
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index a1639ba..aa1c862 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "sclp.h"
@@ -59,13 +60,6 @@ static int _strlen(const char *str)
return i;
}
-static void _memcpy(char *dest, const char *src, int len)
-{
- int i;
- for (i = 0; i < len; i++)
- dest[i] = src[i];
-}
-
void sclp_print(const char *str)
{
int len = _strlen(str);
@@ -76,7 +70,7 @@ void sclp_print(const char *str)
sccb->ebh.length = sizeof(EventBufferHeader) + len;
sccb->ebh.type = SCLP_EVENT_ASCII_CONSOLE_DATA;
sccb->ebh.flags = 0;
- _memcpy(sccb->data, str, len);
+ memcpy(sccb->data, str, len);
sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
}
diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c
index f61ecf0..c92f5d3 100644
--- a/pc-bios/s390-ccw/virtio-scsi.c
+++ b/pc-bios/s390-ccw/virtio-scsi.c
@@ -9,6 +9,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "virtio.h"
#include "scsi.h"
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 6ee93d5..8768331 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "virtio.h"
#include "virtio-scsi.h"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
@ 2017-07-07 10:26 ` Thomas Huth
2017-07-07 12:42 ` Cornelia Huck
2017-07-07 14:05 ` Farhan Ali
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file Thomas Huth
` (5 subsequent siblings)
7 siblings, 2 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:26 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
We will later need this array in a file that we will link to the
netboot code, too. Since there is some ebcdic convertion done
in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
candidate.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/main.c | 11 -----------
pc-bios/s390-ccw/sclp.c | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 40cba8d..0580eac 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -17,17 +17,6 @@ static SubChannelId blk_schid = { .one = 1 };
IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
static char loadparm[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-const unsigned char ebc2asc[256] =
- /* 0123456789abcdef0123456789abcdef */
- "................................" /* 1F */
- "................................" /* 3F */
- " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
- "-/.........,%_>?.........`:#@'=\""/* 7F */
- ".abcdefghi.......jklmnopqr......" /* 9F */
- "..stuvwxyz......................" /* BF */
- ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
- "..STUVWXYZ......0123456789......";/* FF */
-
/*
* Priniciples of Operations (SA22-7832-09) chapter 17 requires that
* a subsystem-identification is at 184-187 and bytes 188-191 are zero
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index aa1c862..2ee204a 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -14,6 +14,17 @@
static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
+const unsigned char ebc2asc[256] =
+ /* 0123456789abcdef0123456789abcdef */
+ "................................" /* 1F */
+ "................................" /* 3F */
+ " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
+ "-/.........,%_>?.........`:#@'=\""/* 7F */
+ ".abcdefghi.......jklmnopqr......" /* 9F */
+ "..stuvwxyz......................" /* BF */
+ ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
+ "..STUVWXYZ......0123456789......";/* FF */
+
/* Perform service call. Return 0 on success, non-zero otherwise. */
static int sclp_service_call(unsigned int command, void *sccb)
{
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
@ 2017-07-07 10:26 ` Thomas Huth
2017-07-07 12:54 ` Cornelia Huck
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 4/8] pc-bios/s390-ccw: Add a write() function for stdio Thomas Huth
` (4 subsequent siblings)
7 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:26 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
The netboot code is going to link against the code from virtio.c, too,
so we've got to move the virtio-block related code out of the way.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/Makefile | 2 +-
pc-bios/s390-ccw/main.c | 2 +-
pc-bios/s390-ccw/s390-ccw.h | 2 +-
pc-bios/s390-ccw/virtio-blk.c | 296 ++++++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/virtio.c | 273 +-------------------------------------
pc-bios/s390-ccw/virtio.h | 4 +
6 files changed, 307 insertions(+), 272 deletions(-)
create mode 100644 pc-bios/s390-ccw/virtio-blk.c
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index fb88c13..4abe7d3 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -9,7 +9,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw)
.PHONY : all clean build-all
-OBJECTS = start.o main.o bootmap.o sclp.o virtio.o virtio-scsi.o
+OBJECTS = start.o main.o bootmap.o sclp.o virtio.o virtio-scsi.o virtio-blk.o
QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS))
QEMU_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float
QEMU_CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 0580eac..401e9db 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -144,7 +144,7 @@ static void virtio_setup(void)
sclp_print("Network boot device detected\n");
vdev->netboot_start_addr = iplb.ccw.netboot_start_addr;
} else {
- virtio_setup_device(blk_schid);
+ virtio_blk_setup_device(blk_schid);
IPL_assert(virtio_ipl_disk_is_valid(), "No valid IPL device detected");
}
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 43e2d42..6fdc858 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -74,7 +74,7 @@ void sclp_get_loadparm_ascii(char *loadparm);
unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
ulong subchan_id, void *load_addr);
bool virtio_is_supported(SubChannelId schid);
-void virtio_setup_device(SubChannelId schid);
+void virtio_blk_setup_device(SubChannelId schid);
int virtio_read(ulong sector, void *load_addr);
int enable_mss_facility(void);
ulong get_second(void);
diff --git a/pc-bios/s390-ccw/virtio-blk.c b/pc-bios/s390-ccw/virtio-blk.c
new file mode 100644
index 0000000..6cb77bc
--- /dev/null
+++ b/pc-bios/s390-ccw/virtio-blk.c
@@ -0,0 +1,296 @@
+/*
+ * Virtio driver bits
+ *
+ * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#include "libc.h"
+#include "s390-ccw.h"
+#include "virtio.h"
+#include "virtio-scsi.h"
+
+static int virtio_blk_read_many(VDev *vdev,
+ ulong sector, void *load_addr, int sec_num)
+{
+ VirtioBlkOuthdr out_hdr;
+ u8 status;
+ VRing *vr = &vdev->vrings[vdev->cmd_vr_idx];
+
+ /* Tell the host we want to read */
+ out_hdr.type = VIRTIO_BLK_T_IN;
+ out_hdr.ioprio = 99;
+ out_hdr.sector = virtio_sector_adjust(sector);
+
+ vring_send_buf(vr, &out_hdr, sizeof(out_hdr), VRING_DESC_F_NEXT);
+
+ /* This is where we want to receive data */
+ vring_send_buf(vr, load_addr, virtio_get_block_size() * sec_num,
+ VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN |
+ VRING_DESC_F_NEXT);
+
+ /* status field */
+ vring_send_buf(vr, &status, sizeof(u8),
+ VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN);
+
+ /* Now we can tell the host to read */
+ vring_wait_reply();
+
+ if (drain_irqs(vr->schid)) {
+ /* Well, whatever status is supposed to contain... */
+ status = 1;
+ }
+ return status;
+}
+
+int virtio_read_many(ulong sector, void *load_addr, int sec_num)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return virtio_blk_read_many(vdev, sector, load_addr, sec_num);
+ case VIRTIO_ID_SCSI:
+ return virtio_scsi_read_many(vdev, sector, load_addr, sec_num);
+ }
+ panic("\n! No readable IPL device !\n");
+ return -1;
+}
+
+unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
+ ulong subchan_id, void *load_addr)
+{
+ u8 status;
+ int sec = rec_list1;
+ int sec_num = ((rec_list2 >> 32) & 0xffff) + 1;
+ int sec_len = rec_list2 >> 48;
+ ulong addr = (ulong)load_addr;
+
+ if (sec_len != virtio_get_block_size()) {
+ return -1;
+ }
+
+ sclp_print(".");
+ status = virtio_read_many(sec, (void *)addr, sec_num);
+ if (status) {
+ panic("I/O Error");
+ }
+ addr += sec_num * virtio_get_block_size();
+
+ return addr;
+}
+
+int virtio_read(ulong sector, void *load_addr)
+{
+ return virtio_read_many(sector, load_addr, 1);
+}
+
+/*
+ * Other supported value pairs, if any, would need to be added here.
+ * Note: head count is always 15.
+ */
+static inline u8 virtio_eckd_sectors_for_block_size(int size)
+{
+ switch (size) {
+ case 512:
+ return 49;
+ case 1024:
+ return 33;
+ case 2048:
+ return 21;
+ case 4096:
+ return 12;
+ }
+ return 0;
+}
+
+VirtioGDN virtio_guessed_disk_nature(void)
+{
+ return virtio_get_device()->guessed_disk_nature;
+}
+
+void virtio_assume_scsi(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ vdev->guessed_disk_nature = VIRTIO_GDN_SCSI;
+ vdev->config.blk.blk_size = VIRTIO_SCSI_BLOCK_SIZE;
+ vdev->config.blk.physical_block_exp = 0;
+ vdev->blk_factor = 1;
+ break;
+ case VIRTIO_ID_SCSI:
+ vdev->scsi_block_size = VIRTIO_SCSI_BLOCK_SIZE;
+ break;
+ }
+}
+
+void virtio_assume_iso9660(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ vdev->guessed_disk_nature = VIRTIO_GDN_SCSI;
+ vdev->config.blk.blk_size = VIRTIO_ISO_BLOCK_SIZE;
+ vdev->config.blk.physical_block_exp = 0;
+ vdev->blk_factor = VIRTIO_ISO_BLOCK_SIZE / VIRTIO_SECTOR_SIZE;
+ break;
+ case VIRTIO_ID_SCSI:
+ vdev->scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
+ break;
+ }
+}
+
+void virtio_assume_eckd(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ vdev->guessed_disk_nature = VIRTIO_GDN_DASD;
+ vdev->blk_factor = 1;
+ vdev->config.blk.physical_block_exp = 0;
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ vdev->config.blk.blk_size = 4096;
+ break;
+ case VIRTIO_ID_SCSI:
+ vdev->config.blk.blk_size = vdev->scsi_block_size;
+ break;
+ }
+ vdev->config.blk.geometry.heads = 15;
+ vdev->config.blk.geometry.sectors =
+ virtio_eckd_sectors_for_block_size(vdev->config.blk.blk_size);
+}
+
+bool virtio_disk_is_scsi(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ if (vdev->guessed_disk_nature == VIRTIO_GDN_SCSI) {
+ return true;
+ }
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return (vdev->config.blk.geometry.heads == 255)
+ && (vdev->config.blk.geometry.sectors == 63)
+ && (virtio_get_block_size() == VIRTIO_SCSI_BLOCK_SIZE);
+ case VIRTIO_ID_SCSI:
+ return true;
+ }
+ return false;
+}
+
+bool virtio_disk_is_eckd(void)
+{
+ VDev *vdev = virtio_get_device();
+ const int block_size = virtio_get_block_size();
+
+ if (vdev->guessed_disk_nature == VIRTIO_GDN_DASD) {
+ return true;
+ }
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return (vdev->config.blk.geometry.heads == 15)
+ && (vdev->config.blk.geometry.sectors ==
+ virtio_eckd_sectors_for_block_size(block_size));
+ case VIRTIO_ID_SCSI:
+ return false;
+ }
+ return false;
+}
+
+bool virtio_ipl_disk_is_valid(void)
+{
+ return virtio_disk_is_scsi() || virtio_disk_is_eckd();
+}
+
+int virtio_get_block_size(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.blk_size << vdev->config.blk.physical_block_exp;
+ case VIRTIO_ID_SCSI:
+ return vdev->scsi_block_size;
+ }
+ return 0;
+}
+
+uint8_t virtio_get_heads(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.geometry.heads;
+ case VIRTIO_ID_SCSI:
+ return vdev->guessed_disk_nature == VIRTIO_GDN_DASD
+ ? vdev->config.blk.geometry.heads : 255;
+ }
+ return 0;
+}
+
+uint8_t virtio_get_sectors(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.geometry.sectors;
+ case VIRTIO_ID_SCSI:
+ return vdev->guessed_disk_nature == VIRTIO_GDN_DASD
+ ? vdev->config.blk.geometry.sectors : 63;
+ }
+ return 0;
+}
+
+uint64_t virtio_get_blocks(void)
+{
+ VDev *vdev = virtio_get_device();
+ const uint64_t factor = virtio_get_block_size() / VIRTIO_SECTOR_SIZE;
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.capacity / factor;
+ case VIRTIO_ID_SCSI:
+ return vdev->scsi_last_block / factor;
+ }
+ return 0;
+}
+
+void virtio_blk_setup_device(SubChannelId schid)
+{
+ VDev *vdev = virtio_get_device();
+
+ vdev->schid = schid;
+ virtio_setup_ccw(vdev);
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ sclp_print("Using virtio-blk.\n");
+ if (!virtio_ipl_disk_is_valid()) {
+ /* make sure all getters but blocksize return 0 for
+ * invalid IPL disk
+ */
+ memset(&vdev->config.blk, 0, sizeof(vdev->config.blk));
+ virtio_assume_scsi();
+ }
+ break;
+ case VIRTIO_ID_SCSI:
+ IPL_assert(vdev->config.scsi.sense_size == VIRTIO_SCSI_SENSE_SIZE,
+ "Config: sense size mismatch");
+ IPL_assert(vdev->config.scsi.cdb_size == VIRTIO_SCSI_CDB_SIZE,
+ "Config: CDB size mismatch");
+
+ sclp_print("Using virtio-scsi.\n");
+ virtio_scsi_setup(vdev);
+ break;
+ default:
+ panic("\n! No IPL device available !\n");
+ }
+}
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 8768331..09ab291 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -70,7 +70,7 @@ static long virtio_notify(SubChannelId schid, int vq_idx, long cookie)
* Virtio functions *
***********************************************/
-static int drain_irqs(SubChannelId schid)
+int drain_irqs(SubChannelId schid)
{
Irb irb = {};
int r = 0;
@@ -155,7 +155,7 @@ static bool vring_notify(VRing *vr)
return vr->cookie >= 0;
}
-static void vring_send_buf(VRing *vr, void *p, int len, int flags)
+void vring_send_buf(VRing *vr, void *p, int len, int flags)
{
/* For follow-up chains we need to keep the first entry point */
if (!(flags & VRING_HIDDEN_IS_CHAIN)) {
@@ -210,7 +210,7 @@ static int vr_poll(VRing *vr)
*
* Returns 0 on success, 1 on timeout.
*/
-static int vring_wait_reply(void)
+int vring_wait_reply(void)
{
ulong target_second = get_second() + vdev.wait_reply_timeout;
@@ -247,242 +247,7 @@ int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd)
return 0;
}
-/***********************************************
- * Virtio block *
- ***********************************************/
-
-static int virtio_blk_read_many(VDev *vdev,
- ulong sector, void *load_addr, int sec_num)
-{
- VirtioBlkOuthdr out_hdr;
- u8 status;
- VRing *vr = &vdev->vrings[vdev->cmd_vr_idx];
-
- /* Tell the host we want to read */
- out_hdr.type = VIRTIO_BLK_T_IN;
- out_hdr.ioprio = 99;
- out_hdr.sector = virtio_sector_adjust(sector);
-
- vring_send_buf(vr, &out_hdr, sizeof(out_hdr), VRING_DESC_F_NEXT);
-
- /* This is where we want to receive data */
- vring_send_buf(vr, load_addr, virtio_get_block_size() * sec_num,
- VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN |
- VRING_DESC_F_NEXT);
-
- /* status field */
- vring_send_buf(vr, &status, sizeof(u8),
- VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN);
-
- /* Now we can tell the host to read */
- vring_wait_reply();
-
- if (drain_irqs(vr->schid)) {
- /* Well, whatever status is supposed to contain... */
- status = 1;
- }
- return status;
-}
-
-int virtio_read_many(ulong sector, void *load_addr, int sec_num)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return virtio_blk_read_many(&vdev, sector, load_addr, sec_num);
- case VIRTIO_ID_SCSI:
- return virtio_scsi_read_many(&vdev, sector, load_addr, sec_num);
- }
- panic("\n! No readable IPL device !\n");
- return -1;
-}
-
-unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
- ulong subchan_id, void *load_addr)
-{
- u8 status;
- int sec = rec_list1;
- int sec_num = ((rec_list2 >> 32) & 0xffff) + 1;
- int sec_len = rec_list2 >> 48;
- ulong addr = (ulong)load_addr;
-
- if (sec_len != virtio_get_block_size()) {
- return -1;
- }
-
- sclp_print(".");
- status = virtio_read_many(sec, (void *)addr, sec_num);
- if (status) {
- panic("I/O Error");
- }
- addr += sec_num * virtio_get_block_size();
-
- return addr;
-}
-
-int virtio_read(ulong sector, void *load_addr)
-{
- return virtio_read_many(sector, load_addr, 1);
-}
-
-/*
- * Other supported value pairs, if any, would need to be added here.
- * Note: head count is always 15.
- */
-static inline u8 virtio_eckd_sectors_for_block_size(int size)
-{
- switch (size) {
- case 512:
- return 49;
- case 1024:
- return 33;
- case 2048:
- return 21;
- case 4096:
- return 12;
- }
- return 0;
-}
-
-VirtioGDN virtio_guessed_disk_nature(void)
-{
- return vdev.guessed_disk_nature;
-}
-
-void virtio_assume_scsi(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- vdev.guessed_disk_nature = VIRTIO_GDN_SCSI;
- vdev.config.blk.blk_size = VIRTIO_SCSI_BLOCK_SIZE;
- vdev.config.blk.physical_block_exp = 0;
- vdev.blk_factor = 1;
- break;
- case VIRTIO_ID_SCSI:
- vdev.scsi_block_size = VIRTIO_SCSI_BLOCK_SIZE;
- break;
- }
-}
-
-void virtio_assume_iso9660(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- vdev.guessed_disk_nature = VIRTIO_GDN_SCSI;
- vdev.config.blk.blk_size = VIRTIO_ISO_BLOCK_SIZE;
- vdev.config.blk.physical_block_exp = 0;
- vdev.blk_factor = VIRTIO_ISO_BLOCK_SIZE / VIRTIO_SECTOR_SIZE;
- break;
- case VIRTIO_ID_SCSI:
- vdev.scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
- break;
- }
-}
-
-void virtio_assume_eckd(void)
-{
- vdev.guessed_disk_nature = VIRTIO_GDN_DASD;
- vdev.blk_factor = 1;
- vdev.config.blk.physical_block_exp = 0;
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- vdev.config.blk.blk_size = 4096;
- break;
- case VIRTIO_ID_SCSI:
- vdev.config.blk.blk_size = vdev.scsi_block_size;
- break;
- }
- vdev.config.blk.geometry.heads = 15;
- vdev.config.blk.geometry.sectors =
- virtio_eckd_sectors_for_block_size(vdev.config.blk.blk_size);
-}
-
-bool virtio_disk_is_scsi(void)
-{
- if (vdev.guessed_disk_nature == VIRTIO_GDN_SCSI) {
- return true;
- }
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return (vdev.config.blk.geometry.heads == 255)
- && (vdev.config.blk.geometry.sectors == 63)
- && (virtio_get_block_size() == VIRTIO_SCSI_BLOCK_SIZE);
- case VIRTIO_ID_SCSI:
- return true;
- }
- return false;
-}
-
-bool virtio_disk_is_eckd(void)
-{
- const int block_size = virtio_get_block_size();
-
- if (vdev.guessed_disk_nature == VIRTIO_GDN_DASD) {
- return true;
- }
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return (vdev.config.blk.geometry.heads == 15)
- && (vdev.config.blk.geometry.sectors ==
- virtio_eckd_sectors_for_block_size(block_size));
- case VIRTIO_ID_SCSI:
- return false;
- }
- return false;
-}
-
-bool virtio_ipl_disk_is_valid(void)
-{
- return virtio_disk_is_scsi() || virtio_disk_is_eckd();
-}
-
-int virtio_get_block_size(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.blk_size << vdev.config.blk.physical_block_exp;
- case VIRTIO_ID_SCSI:
- return vdev.scsi_block_size;
- }
- return 0;
-}
-
-uint8_t virtio_get_heads(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.geometry.heads;
- case VIRTIO_ID_SCSI:
- return vdev.guessed_disk_nature == VIRTIO_GDN_DASD
- ? vdev.config.blk.geometry.heads : 255;
- }
- return 0;
-}
-
-uint8_t virtio_get_sectors(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.geometry.sectors;
- case VIRTIO_ID_SCSI:
- return vdev.guessed_disk_nature == VIRTIO_GDN_DASD
- ? vdev.config.blk.geometry.sectors : 63;
- }
- return 0;
-}
-
-uint64_t virtio_get_blocks(void)
-{
- const uint64_t factor = virtio_get_block_size() / VIRTIO_SECTOR_SIZE;
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.capacity / factor;
- case VIRTIO_ID_SCSI:
- return vdev.scsi_last_block / factor;
- }
- return 0;
-}
-
-static void virtio_setup_ccw(VDev *vdev)
+void virtio_setup_ccw(VDev *vdev)
{
int i, cfg_size = 0;
unsigned char status = VIRTIO_CONFIG_S_DRIVER_OK;
@@ -544,36 +309,6 @@ static void virtio_setup_ccw(VDev *vdev)
"Could not write status to host");
}
-void virtio_setup_device(SubChannelId schid)
-{
- vdev.schid = schid;
- virtio_setup_ccw(&vdev);
-
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- sclp_print("Using virtio-blk.\n");
- if (!virtio_ipl_disk_is_valid()) {
- /* make sure all getters but blocksize return 0 for
- * invalid IPL disk
- */
- memset(&vdev.config.blk, 0, sizeof(vdev.config.blk));
- virtio_assume_scsi();
- }
- break;
- case VIRTIO_ID_SCSI:
- IPL_assert(vdev.config.scsi.sense_size == VIRTIO_SCSI_SENSE_SIZE,
- "Config: sense size mismatch");
- IPL_assert(vdev.config.scsi.cdb_size == VIRTIO_SCSI_CDB_SIZE,
- "Config: CDB size mismatch");
-
- sclp_print("Using virtio-scsi.\n");
- virtio_scsi_setup(&vdev);
- break;
- default:
- panic("\n! No IPL device available !\n");
- }
-}
-
bool virtio_is_supported(SubChannelId schid)
{
vdev.schid = schid;
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index 1eaf865..d743919 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -291,6 +291,10 @@ struct VirtioCmd {
};
typedef struct VirtioCmd VirtioCmd;
+int drain_irqs(SubChannelId schid);
+void vring_send_buf(VRing *vr, void *p, int len, int flags);
+int vring_wait_reply(void);
int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd);
+void virtio_setup_ccw(VDev *vdev);
#endif /* VIRTIO_H */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 4/8] pc-bios/s390-ccw: Add a write() function for stdio
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
` (2 preceding siblings ...)
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file Thomas Huth
@ 2017-07-07 10:27 ` Thomas Huth
2017-07-07 12:57 ` Cornelia Huck
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 5/8] roms/SLOF: Update submodule to latest status Thomas Huth
` (3 subsequent siblings)
7 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:27 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
The stdio functions from the SLOF libc need a write() function for
printing text to stdout/stderr. Let's implement this function by
refactoring the code from sclp_print().
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/sclp.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index 2ee204a..f6466db 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -12,6 +12,8 @@
#include "s390-ccw.h"
#include "sclp.h"
+long write(int fd, const void *buf, size_t len);
+
static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
const unsigned char ebc2asc[256] =
@@ -71,11 +73,14 @@ static int _strlen(const char *str)
return i;
}
-void sclp_print(const char *str)
+long write(int fd, const void *str, size_t len)
{
- int len = _strlen(str);
WriteEventData *sccb = (void *)_sccb;
+ if (fd != 1 && fd != 2) {
+ return -EIO;
+ }
+
sccb->h.length = sizeof(WriteEventData) + len;
sccb->h.function_code = SCLP_FC_NORMAL_WRITE;
sccb->ebh.length = sizeof(EventBufferHeader) + len;
@@ -84,6 +89,13 @@ void sclp_print(const char *str)
memcpy(sccb->data, str, len);
sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
+
+ return len;
+}
+
+void sclp_print(const char *str)
+{
+ write(1, str, _strlen(str));
}
void sclp_get_loadparm_ascii(char *loadparm)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 5/8] roms/SLOF: Update submodule to latest status
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
` (3 preceding siblings ...)
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 4/8] pc-bios/s390-ccw: Add a write() function for stdio Thomas Huth
@ 2017-07-07 10:27 ` Thomas Huth
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 6/8] pc-bios/s390-ccw: Add core files for the network bootloading program Thomas Huth
` (2 subsequent siblings)
7 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:27 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
We need the latest fixes for building the libc and libnet
of SLOF for the s390-ccw network bootloader firmware.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
roms/SLOF | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/SLOF b/roms/SLOF
index 66d250e..64215f4 160000
--- a/roms/SLOF
+++ b/roms/SLOF
@@ -1 +1 @@
-Subproject commit 66d250ef0fd06bb88b7399b9563b5008201f2d63
+Subproject commit 64215f41aafd182e51947dc5d544e5ebaab744ca
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 6/8] pc-bios/s390-ccw: Add core files for the network bootloading program
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
` (4 preceding siblings ...)
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 5/8] roms/SLOF: Update submodule to latest status Thomas Huth
@ 2017-07-07 10:27 ` Thomas Huth
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 8/8] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load Thomas Huth
7 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:27 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
This is just a preparation for the next steps: Add a makefile and a
stripped down copy of pc-bios/s390-ccw/main.c as a basis for the network
bootloader program, linked against the libc from SLOF already (which we
will need for SLOF's libnet). The networking code is not included yet.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/Makefile | 11 +++-
pc-bios/s390-ccw/netboot.mak | 41 +++++++++++++
pc-bios/s390-ccw/netmain.c | 140 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 190 insertions(+), 2 deletions(-)
create mode 100644 pc-bios/s390-ccw/netboot.mak
create mode 100644 pc-bios/s390-ccw/netmain.c
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 4abe7d3..4e11026 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -16,7 +16,7 @@ QEMU_CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector)
LDFLAGS += -Wl,-pie -nostdlib
-build-all: s390-ccw.img
+build-all: s390-ccw.img s390-netboot.img
s390-ccw.elf: $(OBJECTS)
$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
@@ -28,5 +28,12 @@ s390-ccw.img: s390-ccw.elf
$(OBJECTS): Makefile
+ifneq ($(wildcard $(SRC_PATH)/roms/SLOF/lib/libnet),)
+include $(SRC_PATH)/pc-bios/s390-ccw/netboot.mak
+else
+s390-netboot.img:
+ @echo "s390-netboot.img not built since roms/SLOF/ is not available."
+endif
+
clean:
- rm -f *.o *.d *.img *.elf *~
+ $(RM) *.o *.d *.img *.elf *~ *.a
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
new file mode 100644
index 0000000..1eaa0d8
--- /dev/null
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -0,0 +1,41 @@
+
+SLOF_DIR := $(SRC_PATH)/roms/SLOF
+
+NETOBJS := start.o sclp.o virtio.o netmain.o sbrk.o libc.a
+
+LIBC_INC := -I$(SLOF_DIR)/lib/libc/include
+LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
+
+NETLDFLAGS := $(LDFLAGS) -Ttext=0x7800000
+
+$(NETOBJS): CFLAGS += $(LIBC_INC) $(LIBNET_INC)
+
+s390-netboot.elf: $(NETOBJS)
+ $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $(NETOBJS),"BUILD","$(TARGET_DIR)$@")
+
+s390-netboot.img: s390-netboot.elf
+ $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
+
+
+LIBCCMNDIR = $(SLOF_DIR)/lib/libc
+STRINGCMNDIR = $(LIBCCMNDIR)/string
+CTYPECMNDIR = $(LIBCCMNDIR)/ctype
+STDLIBCMNDIR = $(LIBCCMNDIR)/stdlib
+STDIOCMNDIR = $(LIBCCMNDIR)/stdio
+
+include $(STRINGCMNDIR)/Makefile.inc
+include $(CTYPECMNDIR)/Makefile.inc
+include $(STDLIBCMNDIR)/Makefile.inc
+include $(STDIOCMNDIR)/Makefile.inc
+
+STDIO_OBJS = sprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
+ printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
+
+LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS)
+$(LIBCOBJS): CFLAGS += $(LIBC_INC) $(QEMU_CFLAGS)
+
+libc.a: $(LIBCOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
+
+sbrk.o: $(SLOF_DIR)/slof/sbrk.c
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(LIBC_INC) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
new file mode 100644
index 0000000..fcdd7a1
--- /dev/null
+++ b/pc-bios/s390-ccw/netmain.c
@@ -0,0 +1,140 @@
+/*
+ * S390 virtio-ccw network boot loading program
+ *
+ * Copyright 2017 Thomas Huth, Red Hat Inc.
+ *
+ * Based on the S390 virtio-ccw loading program (main.c)
+ * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "s390-ccw.h"
+#include "virtio.h"
+
+extern char _start[];
+
+char stack[PAGE_SIZE * 8] __attribute__((aligned(PAGE_SIZE)));
+IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE)));
+
+static SubChannelId blk_schid = { .one = 1 };
+static uint64_t dest_timer;
+
+static uint64_t get_timer_ms(void)
+{
+ uint64_t clk;
+
+ asm volatile(" stck %0 " : : "Q"(clk) : "memory");
+
+ /* Bit 51 is incrememented each microsecond */
+ return (clk >> (63 - 51)) / 1000;
+}
+
+void set_timer(int val)
+{
+ dest_timer = get_timer_ms() + val;
+}
+
+int get_timer(void)
+{
+ return dest_timer - get_timer_ms();
+}
+
+int get_sec_ticks(void)
+{
+ return 1000; /* number of ticks in 1 second */
+}
+
+void panic(const char *string)
+{
+ sclp_print(string);
+ for (;;) {
+ disabled_wait();
+ }
+}
+
+static bool find_dev(Schib *schib, int dev_no)
+{
+ int i, r;
+
+ for (i = 0; i < 0x10000; i++) {
+ blk_schid.sch_no = i;
+ r = stsch_err(blk_schid, schib);
+ if (r == 3 || r == -EIO) {
+ break;
+ }
+ if (!schib->pmcw.dnv) {
+ continue;
+ }
+ if (!virtio_is_supported(blk_schid)) {
+ continue;
+ }
+ /* Skip net devices since no IPLB is created and therefore no
+ * no network bootloader has been loaded
+ */
+ if (virtio_get_device_type() == VIRTIO_ID_NET && dev_no < 0) {
+ continue;
+ }
+ if (dev_no < 0 || schib->pmcw.dev == dev_no) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+static void virtio_setup(void)
+{
+ Schib schib;
+ int ssid;
+ bool found = false;
+ uint16_t dev_no;
+
+ /*
+ * We unconditionally enable mss support. In every sane configuration,
+ * this will succeed; and even if it doesn't, stsch_err() can deal
+ * with the consequences.
+ */
+ enable_mss_facility();
+
+ if (store_iplb(&iplb)) {
+ IPL_assert(iplb.pbt == S390_IPL_TYPE_CCW, "IPL_TYPE_CCW expected");
+ dev_no = iplb.ccw.devno;
+ debug_print_int("device no. ", dev_no);
+ blk_schid.ssid = iplb.ccw.ssid & 0x3;
+ debug_print_int("ssid ", blk_schid.ssid);
+ found = find_dev(&schib, dev_no);
+ } else {
+ for (ssid = 0; ssid < 0x3; ssid++) {
+ blk_schid.ssid = ssid;
+ found = find_dev(&schib, -1);
+ if (found) {
+ break;
+ }
+ }
+ }
+
+ IPL_assert(found && virtio_get_device_type() == VIRTIO_ID_NET,
+ "No virtio net device found");
+}
+
+void main(void)
+{
+ sclp_setup();
+ sclp_print("Network boot starting...\n");
+
+ virtio_setup();
+
+ panic("Failed to load OS from network\n");
+}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
` (5 preceding siblings ...)
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 6/8] pc-bios/s390-ccw: Add core files for the network bootloading program Thomas Huth
@ 2017-07-07 10:27 ` Thomas Huth
2017-07-07 12:37 ` Cornelia Huck
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 8/8] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load Thomas Huth
7 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:27 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
The driver provides the recv() and send() functions which will
be required by SLOF's libnet code for receiving and sending
packets.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/netboot.mak | 2 +-
pc-bios/s390-ccw/virtio-net.c | 130 ++++++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/virtio.c | 9 ++-
pc-bios/s390-ccw/virtio.h | 13 ++++-
4 files changed, 149 insertions(+), 5 deletions(-)
create mode 100644 pc-bios/s390-ccw/virtio-net.c
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index 1eaa0d8..dd9119a 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,7 +1,7 @@
SLOF_DIR := $(SRC_PATH)/roms/SLOF
-NETOBJS := start.o sclp.o virtio.o netmain.o sbrk.o libc.a
+NETOBJS := start.o sclp.o virtio.o virtio-net.o netmain.o sbrk.o libc.a
LIBC_INC := -I$(SLOF_DIR)/lib/libc/include
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c
new file mode 100644
index 0000000..290b018
--- /dev/null
+++ b/pc-bios/s390-ccw/virtio-net.c
@@ -0,0 +1,130 @@
+/*
+ * Virtio-net driver for the s390-ccw firmware
+ *
+ * Copyright 2017 Thomas Huth, Red Hat Inc.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <ethernet.h>
+#include "s390-ccw.h"
+#include "virtio.h"
+
+#ifndef DEBUG_VIRTIO_NET
+#define DEBUG_VIRTIO_NET 0
+#endif
+
+#define VQ_RX 0 /* Receive queue */
+#define VQ_TX 1 /* Transmit queue */
+
+struct VirtioNetHdr {
+ uint8_t flags;
+ uint8_t gso_type;
+ uint16_t hdr_len;
+ uint16_t gso_size;
+ uint16_t csum_start;
+ uint16_t csum_offset;
+ /*uint16_t num_buffers;*/ /* Only with VIRTIO_NET_F_MRG_RXBUF or VIRTIO1 */
+};
+typedef struct VirtioNetHdr VirtioNetHdr;
+
+static uint16_t rx_last_idx; /* Last index in receive queue "used" ring */
+
+int virtio_net_init(void *mac_addr)
+{
+ VDev *vdev = virtio_get_device();
+ VRing *rxvq = &vdev->vrings[VQ_RX];
+ void *buf;
+ int i;
+
+ virtio_setup_ccw(vdev);
+
+ memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
+
+ for (i = 0; i < 64; i++) {
+ buf = malloc(ETH_MTU_SIZE + sizeof(VirtioNetHdr));
+ IPL_assert(buf != NULL, "Can not allocate memory for receive buffers");
+ vring_send_buf(rxvq, buf, ETH_MTU_SIZE + sizeof(VirtioNetHdr),
+ VRING_DESC_F_WRITE);
+ }
+ vring_notify(rxvq);
+
+ return 0;
+}
+
+int send(int fd, const void *buf, int len, int flags)
+{
+ VirtioNetHdr tx_hdr;
+ VDev *vdev = virtio_get_device();
+ VRing *txvq = &vdev->vrings[VQ_TX];
+
+ /* Set up header - we do not use anything special, so simply clear it */
+ memset(&tx_hdr, 0, sizeof(tx_hdr));
+
+ vring_send_buf(txvq, &tx_hdr, sizeof(tx_hdr), VRING_DESC_F_NEXT);
+ vring_send_buf(txvq, (void *)buf, len, VRING_HIDDEN_IS_CHAIN);
+ while (!vr_poll(txvq)) {
+ yield();
+ }
+ if (drain_irqs(txvq->schid)) {
+ puts("send: drain irqs failed");
+ return -1;
+ }
+
+ return len;
+}
+
+int recv(int fd, void *buf, int maxlen, int flags)
+{
+ VDev *vdev = virtio_get_device();
+ VRing *rxvq = &vdev->vrings[VQ_RX];
+ int len, id;
+ uint8_t *pkt;
+
+ if (rx_last_idx == rxvq->used->idx) {
+ return 0;
+ }
+
+ len = rxvq->used->ring[rx_last_idx % rxvq->num].len - sizeof(VirtioNetHdr);
+ if (len > maxlen) {
+ puts("virtio-net: Receive buffer too small");
+ len = maxlen;
+ }
+ id = rxvq->used->ring[rx_last_idx % rxvq->num].id % rxvq->num;
+ pkt = (uint8_t *)(rxvq->desc[id].addr + sizeof(VirtioNetHdr));
+
+#if DEBUG_VIRTIO_NET /* Dump packet */
+ int i;
+ printf("\nbuf %p: len=%i\n", (void *)rxvq->desc[id].addr, len);
+ for (i = 0; i < 64; i++) {
+ printf(" %02x", pkt[i]);
+ if ((i % 16) == 15) {
+ printf("\n");
+ }
+ }
+ printf("\n");
+#endif
+
+ /* Copy data to destination buffer */
+ memcpy(buf, pkt, len);
+
+ /* Mark buffer as available to the host again */
+ rxvq->avail->ring[rxvq->avail->idx % rxvq->num] = id;
+ rxvq->avail->idx = rxvq->avail->idx + 1;
+ vring_notify(rxvq);
+
+ /* Move index to next entry */
+ rx_last_idx = rx_last_idx + 1;
+
+ return len;
+}
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 09ab291..729d926 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -149,7 +149,7 @@ static void vring_init(VRing *vr, VqInfo *info)
debug_print_addr("init vr", vr);
}
-static bool vring_notify(VRing *vr)
+bool vring_notify(VRing *vr)
{
vr->cookie = virtio_notify(vr->schid, vr->id, vr->cookie);
return vr->cookie >= 0;
@@ -188,7 +188,7 @@ ulong get_second(void)
return (get_clock() >> 12) / 1000000;
}
-static int vr_poll(VRing *vr)
+int vr_poll(VRing *vr)
{
if (vr->used->idx == vr->used_idx) {
vring_notify(vr);
@@ -261,6 +261,11 @@ void virtio_setup_ccw(VDev *vdev)
run_ccw(vdev, CCW_CMD_VDEV_RESET, NULL, 0);
switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_NET:
+ vdev->nr_vqs = 3;
+ vdev->cmd_vr_idx = 0;
+ cfg_size = sizeof(vdev->config.net);
+ break;
case VIRTIO_ID_BLOCK:
vdev->nr_vqs = 1;
vdev->cmd_vr_idx = 0;
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index d743919..d6af022 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -11,8 +11,6 @@
#ifndef VIRTIO_H
#define VIRTIO_H
-#include "s390-ccw.h"
-
/* Status byte for guest to report progress, and synchronize features. */
/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
#define VIRTIO_CONFIG_S_ACKNOWLEDGE 1
@@ -254,6 +252,12 @@ struct ScsiDevice {
};
typedef struct ScsiDevice ScsiDevice;
+struct VirtioNetConfig {
+ uint8_t mac[6];
+ uint16_t status;
+};
+typedef struct VirtioNetConfig VirtioNetConfig;
+
struct VDev {
int nr_vqs;
VRing *vrings;
@@ -266,6 +270,7 @@ struct VDev {
union {
VirtioBlkConfig blk;
VirtioScsiConfig scsi;
+ VirtioNetConfig net;
} config;
ScsiDevice *scsi_device;
bool is_cdrom;
@@ -291,10 +296,14 @@ struct VirtioCmd {
};
typedef struct VirtioCmd VirtioCmd;
+bool vring_notify(VRing *vr);
int drain_irqs(SubChannelId schid);
void vring_send_buf(VRing *vr, void *p, int len, int flags);
+int vr_poll(VRing *vr);
int vring_wait_reply(void);
int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd);
void virtio_setup_ccw(VDev *vdev);
+int virtio_net_init(void *mac_addr);
+
#endif /* VIRTIO_H */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [RFC PATCH v2 8/8] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
` (6 preceding siblings ...)
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
@ 2017-07-07 10:27 ` Thomas Huth
7 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 10:27 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
Most of the code has been taken from SLOF's netload.c file. Now we
can finally load an image via TFTP and execute the downloaded kernel.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/netboot.mak | 12 ++-
pc-bios/s390-ccw/netmain.c | 225 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 236 insertions(+), 1 deletion(-)
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index dd9119a..8c54b05 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,7 +1,7 @@
SLOF_DIR := $(SRC_PATH)/roms/SLOF
-NETOBJS := start.o sclp.o virtio.o virtio-net.o netmain.o sbrk.o libc.a
+NETOBJS := start.o sclp.o virtio.o virtio-net.o netmain.o sbrk.o libnet.a libc.a
LIBC_INC := -I$(SLOF_DIR)/lib/libc/include
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
@@ -39,3 +39,13 @@ libc.a: $(LIBCOBJS)
sbrk.o: $(SLOF_DIR)/slof/sbrk.c
$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(LIBC_INC) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
+ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o
+LIBNETCFLAGS := $(QEMU_CFLAGS) $(LIBC_INC) $(LIBNET_INC)
+
+%.o : $(SLOF_DIR)/lib/libnet/%.c
+ $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+libnet.a: $(LIBNETOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
index fcdd7a1..ba0ccb3 100644
--- a/pc-bios/s390-ccw/netmain.c
+++ b/pc-bios/s390-ccw/netmain.c
@@ -6,6 +6,9 @@
* Based on the S390 virtio-ccw loading program (main.c)
* Copyright (c) 2013 Alexander Graf <agraf@suse.de>
*
+ * And based on the network loading code from SLOF (netload.c)
+ * Copyright (c) 2004, 2008 IBM Corporation
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
@@ -18,17 +21,29 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+
+#include <tftp.h>
+#include <ethernet.h>
+#include <dhcp.h>
+#include <dhcpv6.h>
+#include <ipv4.h>
+#include <ipv6.h>
+#include <dns.h>
#include <time.h>
#include "s390-ccw.h"
#include "virtio.h"
+#define DEFAULT_BOOT_RETRIES 10
+#define DEFAULT_TFTP_RETRIES 20
+
extern char _start[];
char stack[PAGE_SIZE * 8] __attribute__((aligned(PAGE_SIZE)));
IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE)));
static SubChannelId blk_schid = { .one = 1 };
+static int ip_version = 4;
static uint64_t dest_timer;
static uint64_t get_timer_ms(void)
@@ -56,6 +71,208 @@ int get_sec_ticks(void)
return 1000; /* number of ticks in 1 second */
}
+/**
+ * Obtain IP and configuration info from DHCP server (either IPv4 or IPv6).
+ * @param fn_ip contains the following configuration information:
+ * client MAC, client IP, TFTP-server MAC, TFTP-server IP,
+ * boot file name
+ * @param retries Number of DHCP attempts
+ * @return 0 : IP and configuration info obtained;
+ * non-0 : error condition occurred.
+ */
+static int dhcp(struct filename_ip *fn_ip, int retries)
+{
+ int i = retries + 1;
+ int rc = -1;
+
+ printf(" Requesting information via DHCP: ");
+
+ dhcpv4_generate_transaction_id();
+ dhcpv6_generate_transaction_id();
+
+ do {
+ printf("\b\b\b%03d", i - 1);
+ if (!--i) {
+ printf("\nGiving up after %d DHCP requests\n", retries);
+ return -1;
+ }
+ ip_version = 4;
+ rc = dhcpv4(NULL, fn_ip);
+ if (rc == -1) {
+ ip_version = 6;
+ set_ipv6_address(fn_ip->fd, 0);
+ rc = dhcpv6(NULL, fn_ip);
+ if (rc == 0) {
+ memcpy(&fn_ip->own_ip6, get_ipv6_address(), 16);
+ break;
+ }
+ }
+ if (rc != -1) { /* either success or non-dhcp failure */
+ break;
+ }
+ } while (1);
+ printf("\b\b\b\bdone\n");
+
+ return rc;
+}
+
+/**
+ * Seed the random number generator with our mac and current timestamp
+ */
+static void seed_rng(uint8_t mac[])
+{
+ uint64_t seed;
+
+ asm volatile(" stck %0 " : : "Q"(seed) : "memory");
+ seed ^= (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5];
+ srand(seed);
+}
+
+static int tftp_load(filename_ip_t *fnip, void *buffer, int len,
+ unsigned int retries, int ip_vers)
+{
+ tftp_err_t tftp_err;
+ int rc;
+
+ rc = tftp(fnip, buffer, len, retries, &tftp_err, 1, 1428, ip_vers);
+
+ if (rc > 0) {
+ printf(" TFTP: Received %s (%d KBytes)\n", fnip->filename,
+ rc / 1024);
+ } else if (rc == -1) {
+ puts("unknown TFTP error");
+ } else if (rc == -2) {
+ printf("TFTP buffer of %d bytes is too small for %s\n",
+ len, fnip->filename);
+ } else if (rc == -3) {
+ printf("file not found: %s\n", fnip->filename);
+ } else if (rc == -4) {
+ puts("TFTP access violation");
+ } else if (rc == -5) {
+ puts("illegal TFTP operation");
+ } else if (rc == -6) {
+ puts("unknown TFTP transfer ID");
+ } else if (rc == -7) {
+ puts("no such TFTP user");
+ } else if (rc == -8) {
+ puts("TFTP blocksize negotiation failed");
+ } else if (rc == -9) {
+ puts("file exceeds maximum TFTP transfer size");
+ } else if (rc <= -10 && rc >= -15) {
+ const char *icmp_err_str;
+ switch (rc) {
+ case -ICMP_NET_UNREACHABLE - 10:
+ icmp_err_str = "net unreachable";
+ break;
+ case -ICMP_HOST_UNREACHABLE - 10:
+ icmp_err_str = "host unreachable";
+ break;
+ case -ICMP_PROTOCOL_UNREACHABLE - 10:
+ icmp_err_str = "protocol unreachable";
+ break;
+ case -ICMP_PORT_UNREACHABLE - 10:
+ icmp_err_str = "port unreachable";
+ break;
+ case -ICMP_FRAGMENTATION_NEEDED - 10:
+ icmp_err_str = "fragmentation needed and DF set";
+ break;
+ case -ICMP_SOURCE_ROUTE_FAILED - 10:
+ icmp_err_str = "source route failed";
+ break;
+ default:
+ icmp_err_str = " UNKNOWN";
+ break;
+ }
+ printf("ICMP ERROR \"%s\"\n", icmp_err_str);
+ } else if (rc == -40) {
+ printf("TFTP error occurred after %d bad packets received",
+ tftp_err.bad_tftp_packets);
+ } else if (rc == -41) {
+ printf("TFTP error occurred after missing %d responses",
+ tftp_err.no_packets);
+ } else if (rc == -42) {
+ printf("TFTP error missing block %d, expected block was %d",
+ tftp_err.blocks_missed,
+ tftp_err.blocks_received);
+ }
+
+ return rc;
+}
+
+static int net_load(char *buffer, int len)
+{
+ filename_ip_t fn_ip;
+ uint8_t mac[6];
+ int rc;
+
+ memset(&fn_ip, 0, sizeof(filename_ip_t));
+
+ rc = virtio_net_init(mac);
+ if (rc < 0) {
+ puts("Could not initialize network device");
+ return -101;
+ }
+ fn_ip.fd = rc;
+
+ printf(" Using MAC address: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+ set_mac_address(mac); /* init ethernet layer */
+ seed_rng(mac);
+
+ rc = dhcp(&fn_ip, DEFAULT_BOOT_RETRIES);
+ if (rc >= 0) {
+ if (ip_version == 4) {
+ set_ipv4_address(fn_ip.own_ip);
+ }
+ } else {
+ puts("Could not get IP address");
+ return -101;
+ }
+
+ if (ip_version == 4) {
+ printf(" Using IPv4 address: %d.%d.%d.%d\n",
+ (fn_ip.own_ip >> 24) & 0xFF, (fn_ip.own_ip >> 16) & 0xFF,
+ (fn_ip.own_ip >> 8) & 0xFF, fn_ip.own_ip & 0xFF);
+ } else if (ip_version == 6) {
+ char ip6_str[40];
+ ipv6_to_str(fn_ip.own_ip6.addr, ip6_str);
+ printf(" Using IPv6 address: %s\n", ip6_str);
+ }
+
+ if (rc == -2) {
+ printf("ARP request to TFTP server (%d.%d.%d.%d) failed\n",
+ (fn_ip.server_ip >> 24) & 0xFF, (fn_ip.server_ip >> 16) & 0xFF,
+ (fn_ip.server_ip >> 8) & 0xFF, fn_ip.server_ip & 0xFF);
+ return -102;
+ }
+ if (rc == -4 || rc == -3) {
+ puts("Can't obtain TFTP server IP address");
+ return -107;
+ }
+
+ if (ip_version == 4) {
+ printf(" Requesting file \"%s\" via TFTP from %d.%d.%d.%d\n",
+ fn_ip.filename,
+ (fn_ip.server_ip >> 24) & 0xFF, (fn_ip.server_ip >> 16) & 0xFF,
+ (fn_ip.server_ip >> 8) & 0xFF, fn_ip.server_ip & 0xFF);
+ } else if (ip_version == 6) {
+ char ip6_str[40];
+ printf(" Requesting file \"%s\" via TFTP from ", fn_ip.filename);
+ ipv6_to_str(fn_ip.server_ip6.addr, ip6_str);
+ printf("%s\n", ip6_str);
+ }
+
+ /* Do the TFTP load and print error message if necessary */
+ rc = tftp_load(&fn_ip, buffer, len, DEFAULT_TFTP_RETRIES, ip_version);
+
+ if (ip_version == 4) {
+ dhcp_send_release(fn_ip.fd);
+ }
+
+ return rc;
+}
+
void panic(const char *string)
{
sclp_print(string);
@@ -131,10 +348,18 @@ static void virtio_setup(void)
void main(void)
{
+ int rc;
+
sclp_setup();
sclp_print("Network boot starting...\n");
virtio_setup();
+ rc = net_load(NULL, (long)_start);
+ if (rc > 0) {
+ sclp_print("Network loading done, starting kernel...\n");
+ asm volatile (" lpsw 0(%0) " : : "r"(0) : "memory");
+ }
+
panic("Failed to load OS from network\n");
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
@ 2017-07-07 12:37 ` Cornelia Huck
2017-07-10 11:23 ` Thomas Huth
0 siblings, 1 reply; 22+ messages in thread
From: Cornelia Huck @ 2017-07-07 12:37 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On Fri, 7 Jul 2017 12:27:03 +0200
Thomas Huth <thuth@redhat.com> wrote:
> The driver provides the recv() and send() functions which will
> be required by SLOF's libnet code for receiving and sending
> packets.
No thorough review yet, only some things I noticed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/netboot.mak | 2 +-
> pc-bios/s390-ccw/virtio-net.c | 130 ++++++++++++++++++++++++++++++++++++++++++
> pc-bios/s390-ccw/virtio.c | 9 ++-
> pc-bios/s390-ccw/virtio.h | 13 ++++-
> 4 files changed, 149 insertions(+), 5 deletions(-)
> create mode 100644 pc-bios/s390-ccw/virtio-net.c
>
> diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c
> new file mode 100644
> index 0000000..290b018
> --- /dev/null
> +++ b/pc-bios/s390-ccw/virtio-net.c
> @@ -0,0 +1,130 @@
> +/*
> + * Virtio-net driver for the s390-ccw firmware
> + *
> + * Copyright 2017 Thomas Huth, Red Hat Inc.
> + *
> + * This code is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or (at your
> + * option) any later version.
> + */
> +
> +#include <stdint.h>
> +#include <stdbool.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <unistd.h>
> +#include <sys/socket.h>
> +#include <ethernet.h>
> +#include "s390-ccw.h"
> +#include "virtio.h"
> +
> +#ifndef DEBUG_VIRTIO_NET
> +#define DEBUG_VIRTIO_NET 0
> +#endif
> +
> +#define VQ_RX 0 /* Receive queue */
> +#define VQ_TX 1 /* Transmit queue */
> +
> +struct VirtioNetHdr {
> + uint8_t flags;
> + uint8_t gso_type;
> + uint16_t hdr_len;
> + uint16_t gso_size;
> + uint16_t csum_start;
> + uint16_t csum_offset;
> + /*uint16_t num_buffers;*/ /* Only with VIRTIO_NET_F_MRG_RXBUF or VIRTIO1 */
> +};
> +typedef struct VirtioNetHdr VirtioNetHdr;
> +
> +static uint16_t rx_last_idx; /* Last index in receive queue "used" ring */
> +
> +int virtio_net_init(void *mac_addr)
> +{
> + VDev *vdev = virtio_get_device();
> + VRing *rxvq = &vdev->vrings[VQ_RX];
> + void *buf;
> + int i;
> +
> + virtio_setup_ccw(vdev);
> +
> + memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
The mac address in the config space is only valid if the mac feature
flag has been negotiated (although the field always exists).
> +
> + for (i = 0; i < 64; i++) {
> + buf = malloc(ETH_MTU_SIZE + sizeof(VirtioNetHdr));
> + IPL_assert(buf != NULL, "Can not allocate memory for receive buffers");
> + vring_send_buf(rxvq, buf, ETH_MTU_SIZE + sizeof(VirtioNetHdr),
> + VRING_DESC_F_WRITE);
> + }
> + vring_notify(rxvq);
> +
> + return 0;
> +}
> +
> +int send(int fd, const void *buf, int len, int flags)
> +{
> + VirtioNetHdr tx_hdr;
> + VDev *vdev = virtio_get_device();
> + VRing *txvq = &vdev->vrings[VQ_TX];
> +
> + /* Set up header - we do not use anything special, so simply clear it */
> + memset(&tx_hdr, 0, sizeof(tx_hdr));
> +
> + vring_send_buf(txvq, &tx_hdr, sizeof(tx_hdr), VRING_DESC_F_NEXT);
> + vring_send_buf(txvq, (void *)buf, len, VRING_HIDDEN_IS_CHAIN);
> + while (!vr_poll(txvq)) {
> + yield();
> + }
> + if (drain_irqs(txvq->schid)) {
> + puts("send: drain irqs failed");
> + return -1;
Does the caller try again later? drain_irqs() errors may be transient.
> + }
> +
> + return len;
> +}
> +
> +int recv(int fd, void *buf, int maxlen, int flags)
> +{
> + VDev *vdev = virtio_get_device();
> + VRing *rxvq = &vdev->vrings[VQ_RX];
> + int len, id;
> + uint8_t *pkt;
> +
> + if (rx_last_idx == rxvq->used->idx) {
> + return 0;
> + }
> +
> + len = rxvq->used->ring[rx_last_idx % rxvq->num].len - sizeof(VirtioNetHdr);
> + if (len > maxlen) {
> + puts("virtio-net: Receive buffer too small");
> + len = maxlen;
> + }
> + id = rxvq->used->ring[rx_last_idx % rxvq->num].id % rxvq->num;
> + pkt = (uint8_t *)(rxvq->desc[id].addr + sizeof(VirtioNetHdr));
> +
> +#if DEBUG_VIRTIO_NET /* Dump packet */
> + int i;
> + printf("\nbuf %p: len=%i\n", (void *)rxvq->desc[id].addr, len);
> + for (i = 0; i < 64; i++) {
> + printf(" %02x", pkt[i]);
> + if ((i % 16) == 15) {
> + printf("\n");
> + }
> + }
> + printf("\n");
> +#endif
> +
> + /* Copy data to destination buffer */
> + memcpy(buf, pkt, len);
> +
> + /* Mark buffer as available to the host again */
> + rxvq->avail->ring[rxvq->avail->idx % rxvq->num] = id;
> + rxvq->avail->idx = rxvq->avail->idx + 1;
> + vring_notify(rxvq);
> +
> + /* Move index to next entry */
> + rx_last_idx = rx_last_idx + 1;
> +
> + return len;
> +}
> diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
> index 09ab291..729d926 100644
> --- a/pc-bios/s390-ccw/virtio.c
> +++ b/pc-bios/s390-ccw/virtio.c
> @@ -149,7 +149,7 @@ static void vring_init(VRing *vr, VqInfo *info)
> debug_print_addr("init vr", vr);
> }
>
> -static bool vring_notify(VRing *vr)
> +bool vring_notify(VRing *vr)
> {
> vr->cookie = virtio_notify(vr->schid, vr->id, vr->cookie);
> return vr->cookie >= 0;
> @@ -188,7 +188,7 @@ ulong get_second(void)
> return (get_clock() >> 12) / 1000000;
> }
>
> -static int vr_poll(VRing *vr)
> +int vr_poll(VRing *vr)
> {
> if (vr->used->idx == vr->used_idx) {
> vring_notify(vr);
> @@ -261,6 +261,11 @@ void virtio_setup_ccw(VDev *vdev)
> run_ccw(vdev, CCW_CMD_VDEV_RESET, NULL, 0);
>
> switch (vdev->senseid.cu_model) {
> + case VIRTIO_ID_NET:
> + vdev->nr_vqs = 3;
I think this should be 2, as you don't negotiate for the control vq.
> + vdev->cmd_vr_idx = 0;
> + cfg_size = sizeof(vdev->config.net);
> + break;
> case VIRTIO_ID_BLOCK:
> vdev->nr_vqs = 1;
> vdev->cmd_vr_idx = 0;
> diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
> index d743919..d6af022 100644
> --- a/pc-bios/s390-ccw/virtio.h
> +++ b/pc-bios/s390-ccw/virtio.h
> @@ -11,8 +11,6 @@
> #ifndef VIRTIO_H
> #define VIRTIO_H
>
> -#include "s390-ccw.h"
> -
> /* Status byte for guest to report progress, and synchronize features. */
> /* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
> #define VIRTIO_CONFIG_S_ACKNOWLEDGE 1
> @@ -254,6 +252,12 @@ struct ScsiDevice {
> };
> typedef struct ScsiDevice ScsiDevice;
>
> +struct VirtioNetConfig {
> + uint8_t mac[6];
> + uint16_t status;
I don't think status exists if you don't negotiate the respective
feature bit.
> +};
> +typedef struct VirtioNetConfig VirtioNetConfig;
> +
> struct VDev {
> int nr_vqs;
> VRing *vrings;
> @@ -266,6 +270,7 @@ struct VDev {
> union {
> VirtioBlkConfig blk;
> VirtioScsiConfig scsi;
> + VirtioNetConfig net;
> } config;
> ScsiDevice *scsi_device;
> bool is_cdrom;
> @@ -291,10 +296,14 @@ struct VirtioCmd {
> };
> typedef struct VirtioCmd VirtioCmd;
>
> +bool vring_notify(VRing *vr);
> int drain_irqs(SubChannelId schid);
> void vring_send_buf(VRing *vr, void *p, int len, int flags);
> +int vr_poll(VRing *vr);
> int vring_wait_reply(void);
> int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd);
> void virtio_setup_ccw(VDev *vdev);
>
> +int virtio_net_init(void *mac_addr);
> +
> #endif /* VIRTIO_H */
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
@ 2017-07-07 12:42 ` Cornelia Huck
2017-07-07 14:05 ` Farhan Ali
1 sibling, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-07 12:42 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On Fri, 7 Jul 2017 12:26:58 +0200
Thomas Huth <thuth@redhat.com> wrote:
> We will later need this array in a file that we will link to the
> netboot code, too. Since there is some ebcdic convertion done
> in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
> candidate.
Interacting with sclp is probably the only place we'll need to deal
with ebcdic in the ccw bios, so this seems sensible.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/main.c | 11 -----------
> pc-bios/s390-ccw/sclp.c | 11 +++++++++++
> 2 files changed, 11 insertions(+), 11 deletions(-)
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file Thomas Huth
@ 2017-07-07 12:54 ` Cornelia Huck
2017-07-07 13:04 ` Thomas Huth
0 siblings, 1 reply; 22+ messages in thread
From: Cornelia Huck @ 2017-07-07 12:54 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On Fri, 7 Jul 2017 12:26:59 +0200
Thomas Huth <thuth@redhat.com> wrote:
> The netboot code is going to link against the code from virtio.c, too,
> so we've got to move the virtio-block related code out of the way.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/Makefile | 2 +-
> pc-bios/s390-ccw/main.c | 2 +-
> pc-bios/s390-ccw/s390-ccw.h | 2 +-
> pc-bios/s390-ccw/virtio-blk.c | 296 ++++++++++++++++++++++++++++++++++++++++++
> pc-bios/s390-ccw/virtio.c | 273 +-------------------------------------
> pc-bios/s390-ccw/virtio.h | 4 +
> 6 files changed, 307 insertions(+), 272 deletions(-)
> create mode 100644 pc-bios/s390-ccw/virtio-blk.c
>
> diff --git a/pc-bios/s390-ccw/virtio-blk.c b/pc-bios/s390-ccw/virtio-blk.c
> new file mode 100644
> index 0000000..6cb77bc
> --- /dev/null
> +++ b/pc-bios/s390-ccw/virtio-blk.c
> @@ -0,0 +1,296 @@
> +/*
> + * Virtio driver bits
> + *
> + * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
The original code carries the same copyright notice, but there's a lot
of IBM code in there. Just saying.
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or (at
> + * your option) any later version. See the COPYING file in the top-level
> + * directory.
> + */
> +
> +#include "libc.h"
> +#include "s390-ccw.h"
> +#include "virtio.h"
> +#include "virtio-scsi.h"
> +
> +static int virtio_blk_read_many(VDev *vdev,
> + ulong sector, void *load_addr, int sec_num)
> +{
> + VirtioBlkOuthdr out_hdr;
> + u8 status;
> + VRing *vr = &vdev->vrings[vdev->cmd_vr_idx];
> +
> + /* Tell the host we want to read */
> + out_hdr.type = VIRTIO_BLK_T_IN;
> + out_hdr.ioprio = 99;
> + out_hdr.sector = virtio_sector_adjust(sector);
> +
> + vring_send_buf(vr, &out_hdr, sizeof(out_hdr), VRING_DESC_F_NEXT);
> +
> + /* This is where we want to receive data */
> + vring_send_buf(vr, load_addr, virtio_get_block_size() * sec_num,
> + VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN |
> + VRING_DESC_F_NEXT);
> +
> + /* status field */
> + vring_send_buf(vr, &status, sizeof(u8),
> + VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN);
> +
> + /* Now we can tell the host to read */
> + vring_wait_reply();
> +
> + if (drain_irqs(vr->schid)) {
> + /* Well, whatever status is supposed to contain... */
> + status = 1;
> + }
> + return status;
> +}
> +
> +int virtio_read_many(ulong sector, void *load_addr, int sec_num)
> +{
> + VDev *vdev = virtio_get_device();
> +
> + switch (vdev->senseid.cu_model) {
> + case VIRTIO_ID_BLOCK:
> + return virtio_blk_read_many(vdev, sector, load_addr, sec_num);
> + case VIRTIO_ID_SCSI:
> + return virtio_scsi_read_many(vdev, sector, load_addr, sec_num);
This is scsi, not blk. Should virtio_read_many() stay in virtio.c?
> + }
> + panic("\n! No readable IPL device !\n");
> + return -1;
> +}
(...)
> +void virtio_assume_scsi(void)
> +{
> + VDev *vdev = virtio_get_device();
> +
> + switch (vdev->senseid.cu_model) {
> + case VIRTIO_ID_BLOCK:
> + vdev->guessed_disk_nature = VIRTIO_GDN_SCSI;
> + vdev->config.blk.blk_size = VIRTIO_SCSI_BLOCK_SIZE;
> + vdev->config.blk.physical_block_exp = 0;
> + vdev->blk_factor = 1;
> + break;
> + case VIRTIO_ID_SCSI:
> + vdev->scsi_block_size = VIRTIO_SCSI_BLOCK_SIZE;
More scsi. Maybe the file just needs a different name :)
> + break;
> + }
> +}
General ack on splitting out this code.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 4/8] pc-bios/s390-ccw: Add a write() function for stdio
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 4/8] pc-bios/s390-ccw: Add a write() function for stdio Thomas Huth
@ 2017-07-07 12:57 ` Cornelia Huck
0 siblings, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-07 12:57 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On Fri, 7 Jul 2017 12:27:00 +0200
Thomas Huth <thuth@redhat.com> wrote:
> The stdio functions from the SLOF libc need a write() function for
> printing text to stdout/stderr. Let's implement this function by
> refactoring the code from sclp_print().
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/sclp.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file
2017-07-07 12:54 ` Cornelia Huck
@ 2017-07-07 13:04 ` Thomas Huth
2017-07-07 13:06 ` Cornelia Huck
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 13:04 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On 07.07.2017 14:54, Cornelia Huck wrote:
> On Fri, 7 Jul 2017 12:26:59 +0200
> Thomas Huth <thuth@redhat.com> wrote:
>
>> The netboot code is going to link against the code from virtio.c, too,
>> so we've got to move the virtio-block related code out of the way.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> pc-bios/s390-ccw/Makefile | 2 +-
>> pc-bios/s390-ccw/main.c | 2 +-
>> pc-bios/s390-ccw/s390-ccw.h | 2 +-
>> pc-bios/s390-ccw/virtio-blk.c | 296 ++++++++++++++++++++++++++++++++++++++++++
>> pc-bios/s390-ccw/virtio.c | 273 +-------------------------------------
>> pc-bios/s390-ccw/virtio.h | 4 +
>> 6 files changed, 307 insertions(+), 272 deletions(-)
>> create mode 100644 pc-bios/s390-ccw/virtio-blk.c
>>
>
>> diff --git a/pc-bios/s390-ccw/virtio-blk.c b/pc-bios/s390-ccw/virtio-blk.c
>> new file mode 100644
>> index 0000000..6cb77bc
>> --- /dev/null
>> +++ b/pc-bios/s390-ccw/virtio-blk.c
>> @@ -0,0 +1,296 @@
>> +/*
>> + * Virtio driver bits
>> + *
>> + * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
>
> The original code carries the same copyright notice, but there's a lot
> of IBM code in there. Just saying.
Then the IBM folks should maybe add their (c) statement to that file
first? Otherwise, I assume they simply do not care ;-)
[...]
>> +int virtio_read_many(ulong sector, void *load_addr, int sec_num)
>> +{
>> + VDev *vdev = virtio_get_device();
>> +
>> + switch (vdev->senseid.cu_model) {
>> + case VIRTIO_ID_BLOCK:
>> + return virtio_blk_read_many(vdev, sector, load_addr, sec_num);
>> + case VIRTIO_ID_SCSI:
>> + return virtio_scsi_read_many(vdev, sector, load_addr, sec_num);
>
> This is scsi, not blk. Should virtio_read_many() stay in virtio.c?
No, that does not work since virtio_scsi_read_many() is defined in
virtio-scsi.c which is not linked to the netboot code.
>> + }
>> + panic("\n! No readable IPL device !\n");
>> + return -1;
>> +}
> (...)
>> +void virtio_assume_scsi(void)
>> +{
>> + VDev *vdev = virtio_get_device();
>> +
>> + switch (vdev->senseid.cu_model) {
>> + case VIRTIO_ID_BLOCK:
>> + vdev->guessed_disk_nature = VIRTIO_GDN_SCSI;
>> + vdev->config.blk.blk_size = VIRTIO_SCSI_BLOCK_SIZE;
>> + vdev->config.blk.physical_block_exp = 0;
>> + vdev->blk_factor = 1;
>> + break;
>> + case VIRTIO_ID_SCSI:
>> + vdev->scsi_block_size = VIRTIO_SCSI_BLOCK_SIZE;
>
> More scsi. Maybe the file just needs a different name :)
Do you have a better suggestion?
Thomas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file
2017-07-07 13:04 ` Thomas Huth
@ 2017-07-07 13:06 ` Cornelia Huck
0 siblings, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-07 13:06 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On Fri, 7 Jul 2017 15:04:55 +0200
Thomas Huth <thuth@redhat.com> wrote:
> On 07.07.2017 14:54, Cornelia Huck wrote:
> > On Fri, 7 Jul 2017 12:26:59 +0200
> > Thomas Huth <thuth@redhat.com> wrote:
> >> +void virtio_assume_scsi(void)
> >> +{
> >> + VDev *vdev = virtio_get_device();
> >> +
> >> + switch (vdev->senseid.cu_model) {
> >> + case VIRTIO_ID_BLOCK:
> >> + vdev->guessed_disk_nature = VIRTIO_GDN_SCSI;
> >> + vdev->config.blk.blk_size = VIRTIO_SCSI_BLOCK_SIZE;
> >> + vdev->config.blk.physical_block_exp = 0;
> >> + vdev->blk_factor = 1;
> >> + break;
> >> + case VIRTIO_ID_SCSI:
> >> + vdev->scsi_block_size = VIRTIO_SCSI_BLOCK_SIZE;
> >
> > More scsi. Maybe the file just needs a different name :)
>
> Do you have a better suggestion?
virtio-blockdev.c ?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
@ 2017-07-07 13:46 ` Christian Borntraeger
2017-07-07 15:05 ` Thomas Huth
2017-07-07 13:56 ` Farhan Ali
1 sibling, 1 reply; 22+ messages in thread
From: Christian Borntraeger @ 2017-07-07 13:46 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
On 07/07/2017 12:26 PM, Thomas Huth wrote:
> The upcoming netboot code will use the libc from SLOF. To be able
> to still use s390-ccw.h there, the libc related functions in this
> header have to be moved to a different location.
> And while we're at it, remove the duplicate memcpy() function from
> sclp.c.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
one suggestion below, but
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
for change and no change
[...]
> +static inline void *memcpy(void *s1, const void *s2, size_t n)
> +{
> + uint8_t *p1 = s1;
> + const uint8_t *p2 = s2;
> +
> + while (n--) {
> + p1[n] = p2[n];
> + }
> + return s1;
> +}
Not that it matters, and no idea if moving forward like in the for loop below
might allow gcc to generate better code, but a for loop like below will be the
same direction as the MVC instruction. Can you double check if this generates
better code?
> -static void _memcpy(char *dest, const char *src, int len)
> -{
> - int i;
> - for (i = 0; i < len; i++)
> - dest[i] = src[i];
> -}
> -
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
2017-07-07 13:46 ` Christian Borntraeger
@ 2017-07-07 13:56 ` Farhan Ali
1 sibling, 0 replies; 22+ messages in thread
From: Farhan Ali @ 2017-07-07 13:56 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Christian Borntraeger
Cc: Alexander Graf, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
On 07/07/2017 06:26 AM, Thomas Huth wrote:
> The upcoming netboot code will use the libc from SLOF. To be able
> to still use s390-ccw.h there, the libc related functions in this
> header have to be moved to a different location.
> And while we're at it, remove the duplicate memcpy() function from
> sclp.c.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/bootmap.c | 1 +
> pc-bios/s390-ccw/libc.h | 43 ++++++++++++++++++++++++++++++++++++++++++
> pc-bios/s390-ccw/main.c | 1 +
> pc-bios/s390-ccw/s390-ccw.h | 29 ----------------------------
> pc-bios/s390-ccw/sclp.c | 10 ++--------
> pc-bios/s390-ccw/virtio-scsi.c | 1 +
> pc-bios/s390-ccw/virtio.c | 1 +
> 7 files changed, 49 insertions(+), 37 deletions(-)
> create mode 100644 pc-bios/s390-ccw/libc.h
>
> diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
> index 523fa78..458d3da 100644
> --- a/pc-bios/s390-ccw/bootmap.c
> +++ b/pc-bios/s390-ccw/bootmap.c
> @@ -8,6 +8,7 @@
> * directory.
> */
>
> +#include "libc.h"
> #include "s390-ccw.h"
> #include "bootmap.h"
> #include "virtio.h"
> diff --git a/pc-bios/s390-ccw/libc.h b/pc-bios/s390-ccw/libc.h
> new file mode 100644
> index 0000000..9076bb7
> --- /dev/null
> +++ b/pc-bios/s390-ccw/libc.h
> @@ -0,0 +1,43 @@
> +/*
> + * libc-style definitions and functions
> + *
> + * This code is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or (at your
> + * option) any later version.
> + */
> +
> +#ifndef S390_CCW_LIBC_H
> +#define S390_CCW_LIBC_H
> +
> +typedef long size_t;
> +typedef int bool;
> +typedef unsigned char uint8_t;
> +typedef unsigned short uint16_t;
> +typedef unsigned int uint32_t;
> +typedef unsigned long long uint64_t;
> +
> +static inline void *memset(void *s, int c, size_t n)
> +{
> + int i;
> + unsigned char *p = s;
> +
> + for (i = 0; i < n; i++) {
> + p[i] = c;
> + }
> +
> + return s;
> +}
> +
> +static inline void *memcpy(void *s1, const void *s2, size_t n)
> +{
> + uint8_t *p1 = s1;
> + const uint8_t *p2 = s2;
> +
> + while (n--) {
> + p1[n] = p2[n];
> + }
> + return s1;
> +}
> +
> +#endif
> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
> index 1cacc1b..40cba8d 100644
> --- a/pc-bios/s390-ccw/main.c
> +++ b/pc-bios/s390-ccw/main.c
> @@ -8,6 +8,7 @@
> * directory.
> */
>
> +#include "libc.h"
> #include "s390-ccw.h"
> #include "virtio.h"
>
> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
> index 2089274..43e2d42 100644
> --- a/pc-bios/s390-ccw/s390-ccw.h
> +++ b/pc-bios/s390-ccw/s390-ccw.h
> @@ -18,12 +18,6 @@ typedef unsigned short u16;
> typedef unsigned int u32;
> typedef unsigned long long u64;
> typedef unsigned long ulong;
> -typedef long size_t;
> -typedef int bool;
> -typedef unsigned char uint8_t;
> -typedef unsigned short uint16_t;
> -typedef unsigned int uint32_t;
> -typedef unsigned long long uint64_t;
> typedef unsigned char __u8;
> typedef unsigned short __u16;
> typedef unsigned int __u32;
> @@ -88,18 +82,6 @@ ulong get_second(void);
> /* bootmap.c */
> void zipl_load(void);
>
> -static inline void *memset(void *s, int c, size_t n)
> -{
> - int i;
> - unsigned char *p = s;
> -
> - for (i = 0; i < n; i++) {
> - p[i] = c;
> - }
> -
> - return s;
> -}
> -
> static inline void fill_hex(char *out, unsigned char val)
> {
> const char hex[] = "0123456789abcdef";
> @@ -169,17 +151,6 @@ static inline void sleep(unsigned int seconds)
> }
> }
>
> -static inline void *memcpy(void *s1, const void *s2, size_t n)
> -{
> - uint8_t *p1 = s1;
> - const uint8_t *p2 = s2;
> -
> - while (n--) {
> - p1[n] = p2[n];
> - }
> - return s1;
> -}
> -
> static inline void IPL_assert(bool term, const char *message)
> {
> if (!term) {
> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
> index a1639ba..aa1c862 100644
> --- a/pc-bios/s390-ccw/sclp.c
> +++ b/pc-bios/s390-ccw/sclp.c
> @@ -8,6 +8,7 @@
> * directory.
> */
>
> +#include "libc.h"
> #include "s390-ccw.h"
> #include "sclp.h"
>
> @@ -59,13 +60,6 @@ static int _strlen(const char *str)
> return i;
> }
>
> -static void _memcpy(char *dest, const char *src, int len)
> -{
> - int i;
> - for (i = 0; i < len; i++)
> - dest[i] = src[i];
> -}
> -
> void sclp_print(const char *str)
> {
> int len = _strlen(str);
> @@ -76,7 +70,7 @@ void sclp_print(const char *str)
> sccb->ebh.length = sizeof(EventBufferHeader) + len;
> sccb->ebh.type = SCLP_EVENT_ASCII_CONSOLE_DATA;
> sccb->ebh.flags = 0;
> - _memcpy(sccb->data, str, len);
> + memcpy(sccb->data, str, len);
>
> sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
> }
> diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c
> index f61ecf0..c92f5d3 100644
> --- a/pc-bios/s390-ccw/virtio-scsi.c
> +++ b/pc-bios/s390-ccw/virtio-scsi.c
> @@ -9,6 +9,7 @@
> * directory.
> */
>
> +#include "libc.h"
> #include "s390-ccw.h"
> #include "virtio.h"
> #include "scsi.h"
> diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
> index 6ee93d5..8768331 100644
> --- a/pc-bios/s390-ccw/virtio.c
> +++ b/pc-bios/s390-ccw/virtio.c
> @@ -8,6 +8,7 @@
> * directory.
> */
>
> +#include "libc.h"
> #include "s390-ccw.h"
> #include "virtio.h"
> #include "virtio-scsi.h"
>
Reviewed-by: Farhan Ali <alifm@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
2017-07-07 12:42 ` Cornelia Huck
@ 2017-07-07 14:05 ` Farhan Ali
1 sibling, 0 replies; 22+ messages in thread
From: Farhan Ali @ 2017-07-07 14:05 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Christian Borntraeger
Cc: Alexander Graf, David Hildenbrand, Viktor Mihajlovski,
Cornelia Huck
On 07/07/2017 06:26 AM, Thomas Huth wrote:
> We will later need this array in a file that we will link to the
> netboot code, too. Since there is some ebcdic convertion done
> in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
> candidate.
s/convertion/conversion
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/main.c | 11 -----------
> pc-bios/s390-ccw/sclp.c | 11 +++++++++++
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
> index 40cba8d..0580eac 100644
> --- a/pc-bios/s390-ccw/main.c
> +++ b/pc-bios/s390-ccw/main.c
> @@ -17,17 +17,6 @@ static SubChannelId blk_schid = { .one = 1 };
> IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
> static char loadparm[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
>
> -const unsigned char ebc2asc[256] =
> - /* 0123456789abcdef0123456789abcdef */
> - "................................" /* 1F */
> - "................................" /* 3F */
> - " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
> - "-/.........,%_>?.........`:#@'=\""/* 7F */
> - ".abcdefghi.......jklmnopqr......" /* 9F */
> - "..stuvwxyz......................" /* BF */
> - ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
> - "..STUVWXYZ......0123456789......";/* FF */
> -
> /*
> * Priniciples of Operations (SA22-7832-09) chapter 17 requires that
> * a subsystem-identification is at 184-187 and bytes 188-191 are zero
> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
> index aa1c862..2ee204a 100644
> --- a/pc-bios/s390-ccw/sclp.c
> +++ b/pc-bios/s390-ccw/sclp.c
> @@ -14,6 +14,17 @@
>
> static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
>
> +const unsigned char ebc2asc[256] =
> + /* 0123456789abcdef0123456789abcdef */
> + "................................" /* 1F */
> + "................................" /* 3F */
> + " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
> + "-/.........,%_>?.........`:#@'=\""/* 7F */
> + ".abcdefghi.......jklmnopqr......" /* 9F */
> + "..stuvwxyz......................" /* BF */
> + ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
> + "..STUVWXYZ......0123456789......";/* FF */
> +
> /* Perform service call. Return 0 on success, non-zero otherwise. */
> static int sclp_service_call(unsigned int command, void *sccb)
> {
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header
2017-07-07 13:46 ` Christian Borntraeger
@ 2017-07-07 15:05 ` Thomas Huth
2017-07-07 15:10 ` Thomas Huth
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 15:05 UTC (permalink / raw)
To: Christian Borntraeger, qemu-devel
Cc: Cornelia Huck, Viktor Mihajlovski, Farhan Ali, Alexander Graf,
David Hildenbrand
On 07.07.2017 15:46, Christian Borntraeger wrote:
> On 07/07/2017 12:26 PM, Thomas Huth wrote:
>> The upcoming netboot code will use the libc from SLOF. To be able
>> to still use s390-ccw.h there, the libc related functions in this
>> header have to be moved to a different location.
>> And while we're at it, remove the duplicate memcpy() function from
>> sclp.c.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> one suggestion below, but
>
> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
>
> for change and no change
>
> [...]
>> +static inline void *memcpy(void *s1, const void *s2, size_t n)
>> +{
>> + uint8_t *p1 = s1;
>> + const uint8_t *p2 = s2;
>> +
>> + while (n--) {
>> + p1[n] = p2[n];
>> + }
>> + return s1;
>> +}
>
> Not that it matters, and no idea if moving forward like in the for loop below
> might allow gcc to generate better code, but a for loop like below will be the
> same direction as the MVC instruction. Can you double check if this generates
> better code?
At least with my compiler version (old 4.8.1), the code looks pretty
similar. Backward loop:
1d8: a7 19 04 d1 lghi %r1,1233
1dc: e3 40 50 00 00 04 lg %r4,0(%r5)
1e2: e3 30 70 00 00 04 lg %r3,0(%r7)
1e8: a7 29 04 d2 lghi %r2,1234
1ec: 43 01 30 00 ic %r0,0(%r1,%r3)
1f0: a7 1b ff ff aghi %r1,-1
1f4: 42 01 40 01 stc %r0,1(%r1,%r4)
1f8: a7 27 ff fa brctg %r2,1ec <main+0x1ec>
Forward loop:
238: a7 19 00 00 lghi %r1,0
23c: e3 40 50 00 00 04 lg %r4,0(%r5)
242: e3 30 70 00 00 04 lg %r3,0(%r7)
248: a7 29 04 d2 lghi %r2,1234
24c: 43 01 30 00 ic %r0,0(%r1,%r3)
250: 42 01 40 00 stc %r0,0(%r1,%r4)
254: a7 1b 00 01 aghi %r1,1
258: a7 27 ff fa brctg %r2,24c <main+0x24c>
But I can switch to the for-loop version in my patch anyway, if you
prefer that.
Thomas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header
2017-07-07 15:05 ` Thomas Huth
@ 2017-07-07 15:10 ` Thomas Huth
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-07 15:10 UTC (permalink / raw)
To: qemu-devel
On 07.07.2017 17:05, Thomas Huth wrote:
> On 07.07.2017 15:46, Christian Borntraeger wrote:
>> On 07/07/2017 12:26 PM, Thomas Huth wrote:
>>> The upcoming netboot code will use the libc from SLOF. To be able
>>> to still use s390-ccw.h there, the libc related functions in this
>>> header have to be moved to a different location.
>>> And while we're at it, remove the duplicate memcpy() function from
>>> sclp.c.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>
>> one suggestion below, but
>>
>> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>
>> for change and no change
>>
>> [...]
>>> +static inline void *memcpy(void *s1, const void *s2, size_t n)
>>> +{
>>> + uint8_t *p1 = s1;
>>> + const uint8_t *p2 = s2;
>>> +
>>> + while (n--) {
>>> + p1[n] = p2[n];
>>> + }
>>> + return s1;
>>> +}
>>
>> Not that it matters, and no idea if moving forward like in the for loop below
>> might allow gcc to generate better code, but a for loop like below will be the
>> same direction as the MVC instruction. Can you double check if this generates
>> better code?
>
> At least with my compiler version (old 4.8.1), the code looks pretty
> similar. Backward loop:
>
> 1d8: a7 19 04 d1 lghi %r1,1233
> 1dc: e3 40 50 00 00 04 lg %r4,0(%r5)
> 1e2: e3 30 70 00 00 04 lg %r3,0(%r7)
> 1e8: a7 29 04 d2 lghi %r2,1234
> 1ec: 43 01 30 00 ic %r0,0(%r1,%r3)
> 1f0: a7 1b ff ff aghi %r1,-1
> 1f4: 42 01 40 01 stc %r0,1(%r1,%r4)
> 1f8: a7 27 ff fa brctg %r2,1ec <main+0x1ec>
>
> Forward loop:
>
> 238: a7 19 00 00 lghi %r1,0
> 23c: e3 40 50 00 00 04 lg %r4,0(%r5)
> 242: e3 30 70 00 00 04 lg %r3,0(%r7)
> 248: a7 29 04 d2 lghi %r2,1234
> 24c: 43 01 30 00 ic %r0,0(%r1,%r3)
> 250: 42 01 40 00 stc %r0,0(%r1,%r4)
> 254: a7 1b 00 01 aghi %r1,1
> 258: a7 27 ff fa brctg %r2,24c <main+0x24c>
>
> But I can switch to the for-loop version in my patch anyway, if you
> prefer that.
FWIW, if I define memcpy() via __builtin_memcpy() instead, I get a MVC
in the disassembly... should we use maybe that macro instead?
Thomas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code
2017-07-07 12:37 ` Cornelia Huck
@ 2017-07-10 11:23 ` Thomas Huth
2017-07-10 11:38 ` Cornelia Huck
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-10 11:23 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On 07.07.2017 14:37, Cornelia Huck wrote:
> On Fri, 7 Jul 2017 12:27:03 +0200
> Thomas Huth <thuth@redhat.com> wrote:
>
>> The driver provides the recv() and send() functions which will
>> be required by SLOF's libnet code for receiving and sending
>> packets.
[...]
>> +int virtio_net_init(void *mac_addr)
>> +{
>> + VDev *vdev = virtio_get_device();
>> + VRing *rxvq = &vdev->vrings[VQ_RX];
>> + void *buf;
>> + int i;
>> +
>> + virtio_setup_ccw(vdev);
>> +
>> + memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
>
> The mac address in the config space is only valid if the mac feature
> flag has been negotiated (although the field always exists).
QEMU seems to always set it ... but yes, let's better negotiate
VIRTIO_NET_F_MAC here.
>> +
>> + for (i = 0; i < 64; i++) {
>> + buf = malloc(ETH_MTU_SIZE + sizeof(VirtioNetHdr));
>> + IPL_assert(buf != NULL, "Can not allocate memory for receive buffers");
>> + vring_send_buf(rxvq, buf, ETH_MTU_SIZE + sizeof(VirtioNetHdr),
>> + VRING_DESC_F_WRITE);
>> + }
>> + vring_notify(rxvq);
>> +
>> + return 0;
>> +}
>> +
>> +int send(int fd, const void *buf, int len, int flags)
>> +{
>> + VirtioNetHdr tx_hdr;
>> + VDev *vdev = virtio_get_device();
>> + VRing *txvq = &vdev->vrings[VQ_TX];
>> +
>> + /* Set up header - we do not use anything special, so simply clear it */
>> + memset(&tx_hdr, 0, sizeof(tx_hdr));
>> +
>> + vring_send_buf(txvq, &tx_hdr, sizeof(tx_hdr), VRING_DESC_F_NEXT);
>> + vring_send_buf(txvq, (void *)buf, len, VRING_HIDDEN_IS_CHAIN);
>> + while (!vr_poll(txvq)) {
>> + yield();
>> + }
>> + if (drain_irqs(txvq->schid)) {
>> + puts("send: drain irqs failed");
>> + return -1;
>
> Does the caller try again later? drain_irqs() errors may be transient.
Yes, the TFTP code retries to send packets after a certain amount of
time (since the packets could also be lost in the network somewhere).
>> diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
>> index 09ab291..729d926 100644
>> --- a/pc-bios/s390-ccw/virtio.c
>> +++ b/pc-bios/s390-ccw/virtio.c
>> @@ -149,7 +149,7 @@ static void vring_init(VRing *vr, VqInfo *info)
>> debug_print_addr("init vr", vr);
>> }
>>
>> -static bool vring_notify(VRing *vr)
>> +bool vring_notify(VRing *vr)
>> {
>> vr->cookie = virtio_notify(vr->schid, vr->id, vr->cookie);
>> return vr->cookie >= 0;
>> @@ -188,7 +188,7 @@ ulong get_second(void)
>> return (get_clock() >> 12) / 1000000;
>> }
>>
>> -static int vr_poll(VRing *vr)
>> +int vr_poll(VRing *vr)
>> {
>> if (vr->used->idx == vr->used_idx) {
>> vring_notify(vr);
>> @@ -261,6 +261,11 @@ void virtio_setup_ccw(VDev *vdev)
>> run_ccw(vdev, CCW_CMD_VDEV_RESET, NULL, 0);
>>
>> switch (vdev->senseid.cu_model) {
>> + case VIRTIO_ID_NET:
>> + vdev->nr_vqs = 3;
>
> I think this should be 2, as you don't negotiate for the control vq.
OK.
>> + vdev->cmd_vr_idx = 0;
>> + cfg_size = sizeof(vdev->config.net);
>> + break;
>> case VIRTIO_ID_BLOCK:
>> vdev->nr_vqs = 1;
>> vdev->cmd_vr_idx = 0;
>> diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
>> index d743919..d6af022 100644
>> --- a/pc-bios/s390-ccw/virtio.h
>> +++ b/pc-bios/s390-ccw/virtio.h
>> @@ -11,8 +11,6 @@
>> #ifndef VIRTIO_H
>> #define VIRTIO_H
>>
>> -#include "s390-ccw.h"
>> -
>> /* Status byte for guest to report progress, and synchronize features. */
>> /* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
>> #define VIRTIO_CONFIG_S_ACKNOWLEDGE 1
>> @@ -254,6 +252,12 @@ struct ScsiDevice {
>> };
>> typedef struct ScsiDevice ScsiDevice;
>>
>> +struct VirtioNetConfig {
>> + uint8_t mac[6];
>> + uint16_t status;
>
> I don't think status exists if you don't negotiate the respective
> feature bit.
OK.
>> +};
>> +typedef struct VirtioNetConfig VirtioNetConfig;
>> +
>> struct VDev {
>> int nr_vqs;
>> VRing *vrings;
>> @@ -266,6 +270,7 @@ struct VDev {
>> union {
>> VirtioBlkConfig blk;
>> VirtioScsiConfig scsi;
>> + VirtioNetConfig net;
>> } config;
>> ScsiDevice *scsi_device;
>> bool is_cdrom;
>> @@ -291,10 +296,14 @@ struct VirtioCmd {
>> };
>> typedef struct VirtioCmd VirtioCmd;
>>
>> +bool vring_notify(VRing *vr);
>> int drain_irqs(SubChannelId schid);
>> void vring_send_buf(VRing *vr, void *p, int len, int flags);
>> +int vr_poll(VRing *vr);
>> int vring_wait_reply(void);
>> int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd);
>> void virtio_setup_ccw(VDev *vdev);
>>
>> +int virtio_net_init(void *mac_addr);
>> +
>> #endif /* VIRTIO_H */
>
Thanks for the review!
Thomas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code
2017-07-10 11:23 ` Thomas Huth
@ 2017-07-10 11:38 ` Cornelia Huck
0 siblings, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-10 11:38 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski
On Mon, 10 Jul 2017 13:23:07 +0200
Thomas Huth <thuth@redhat.com> wrote:
> On 07.07.2017 14:37, Cornelia Huck wrote:
> > On Fri, 7 Jul 2017 12:27:03 +0200
> > Thomas Huth <thuth@redhat.com> wrote:
> >
> >> The driver provides the recv() and send() functions which will
> >> be required by SLOF's libnet code for receiving and sending
> >> packets.
> [...]
> >> +int virtio_net_init(void *mac_addr)
> >> +{
> >> + VDev *vdev = virtio_get_device();
> >> + VRing *rxvq = &vdev->vrings[VQ_RX];
> >> + void *buf;
> >> + int i;
> >> +
> >> + virtio_setup_ccw(vdev);
> >> +
> >> + memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
> >
> > The mac address in the config space is only valid if the mac feature
> > flag has been negotiated (although the field always exists).
>
> QEMU seems to always set it ... but yes, let's better negotiate
> VIRTIO_NET_F_MAC here.
Ah, feature negotiation in the bios, nice :)
>
> >> +
> >> + for (i = 0; i < 64; i++) {
> >> + buf = malloc(ETH_MTU_SIZE + sizeof(VirtioNetHdr));
> >> + IPL_assert(buf != NULL, "Can not allocate memory for receive buffers");
> >> + vring_send_buf(rxvq, buf, ETH_MTU_SIZE + sizeof(VirtioNetHdr),
> >> + VRING_DESC_F_WRITE);
> >> + }
> >> + vring_notify(rxvq);
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +int send(int fd, const void *buf, int len, int flags)
> >> +{
> >> + VirtioNetHdr tx_hdr;
> >> + VDev *vdev = virtio_get_device();
> >> + VRing *txvq = &vdev->vrings[VQ_TX];
> >> +
> >> + /* Set up header - we do not use anything special, so simply clear it */
> >> + memset(&tx_hdr, 0, sizeof(tx_hdr));
> >> +
> >> + vring_send_buf(txvq, &tx_hdr, sizeof(tx_hdr), VRING_DESC_F_NEXT);
> >> + vring_send_buf(txvq, (void *)buf, len, VRING_HIDDEN_IS_CHAIN);
> >> + while (!vr_poll(txvq)) {
> >> + yield();
> >> + }
> >> + if (drain_irqs(txvq->schid)) {
> >> + puts("send: drain irqs failed");
> >> + return -1;
> >
> > Does the caller try again later? drain_irqs() errors may be transient.
>
> Yes, the TFTP code retries to send packets after a certain amount of
> time (since the packets could also be lost in the network somewhere).
Sounds good. (Not that I expect many errors in drain_irqs()...)
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2017-07-10 11:38 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-07 10:26 [Qemu-devel] [RFC PATCH v2 0/8] Implement network booting directly into the s390-ccw BIOS Thomas Huth
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 1/8] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
2017-07-07 13:46 ` Christian Borntraeger
2017-07-07 15:05 ` Thomas Huth
2017-07-07 15:10 ` Thomas Huth
2017-07-07 13:56 ` Farhan Ali
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
2017-07-07 12:42 ` Cornelia Huck
2017-07-07 14:05 ` Farhan Ali
2017-07-07 10:26 ` [Qemu-devel] [RFC PATCH v2 3/8] pc-bios/s390-ccw: Move virtio-block related functions into a separate file Thomas Huth
2017-07-07 12:54 ` Cornelia Huck
2017-07-07 13:04 ` Thomas Huth
2017-07-07 13:06 ` Cornelia Huck
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 4/8] pc-bios/s390-ccw: Add a write() function for stdio Thomas Huth
2017-07-07 12:57 ` Cornelia Huck
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 5/8] roms/SLOF: Update submodule to latest status Thomas Huth
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 6/8] pc-bios/s390-ccw: Add core files for the network bootloading program Thomas Huth
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 7/8] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
2017-07-07 12:37 ` Cornelia Huck
2017-07-10 11:23 ` Thomas Huth
2017-07-10 11:38 ` Cornelia Huck
2017-07-07 10:27 ` [Qemu-devel] [RFC PATCH v2 8/8] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load Thomas Huth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).