nodedev: detect AP card device

Introduce support for the Adjunct Processor (AP) crypto card device.
Udev already detects the device, so add support for libvirt nodedev
driver.

https://www.kernel.org/doc/html/latest/s390/vfio-ap.html#ap-architectural-overview

Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in
index c7df69c9013b08f34b401e4a77b088e49c629207..d10a79e37d03158b838ffc8f161c4ab32ad2a408 100644 (file)
--- a/docs/formatnode.html.in
+++ b/docs/formatnode.html.in
@@ -431,6 +431,14 @@
                   device.</dd>
             </dl>
           </dd>
+          <dt><code>ap_card</code></dt>
+          <dd>Describes the Adjunct Processor (AP) Card device on a S390 host.
+              Sub-elements include:
+            <dl>
+              <dt><code>ap-adapter</code></dt>
+              <dd>AP Card identifier.</dd>
+            </dl>
+          </dd>
         </dl>
       </dd>
     </dl>

diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
index b3e986659e9fda3e728168ad2dcbedaa636b476a..d2f9dac6d95d79a6759d5bf68efafa8c7abcf775 100644 (file)
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -87,6 +87,7 @@
         <ref name="capccwdev"/>
         <ref name="capcssdev"/>
         <ref name="capvdpa"/>
+        <ref name="capapcard"/>
       </choice>
     </element>
   </define>
@@ -668,6 +669,15 @@
     </element>
   </define>
 
+  <define name="capapcard">
+    <attribute name="type">
+      <value>ap_card</value>
+    </attribute>
+    <element name="ap-adapter">
+      <ref name="uint8"/>
+    </element>
+  </define>
+
   <define name="address">
     <element name="address">
       <attribute name="domain"><ref name="hexuint"/></attribute>

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index cac4243b501a64ce17a40b72bbe95038f9e6aa1b..5df0b25df7905f4e56f6c532a336f9dad883f6f7 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -67,6 +67,7 @@ VIR_ENUM_IMPL(virNodeDevCap,
               "ccw",
               "css",
               "vdpa",
+              "ap_card",
 );
 
 VIR_ENUM_IMPL(virNodeDevNetCap,
@@ -650,6 +651,10 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def)
         case VIR_NODE_DEV_CAP_VDPA:
             virNodeDeviceCapVDPADefFormat(&buf, data);
             break;
+        case VIR_NODE_DEV_CAP_AP_CARD:
+            virBufferAsprintf(&buf, "<ap-adapter>0x%02x</ap-adapter>\n",
+                              data->ap_card.ap_adapter);
+            break;
         case VIR_NODE_DEV_CAP_MDEV_TYPES:
         case VIR_NODE_DEV_CAP_FC_HOST:
         case VIR_NODE_DEV_CAP_VPORTS:
@@ -941,6 +946,43 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt,
 }
 
 
+static int
+virNodeDevCapAPAdapterParseXML(xmlXPathContextPtr ctxt,
+                               virNodeDeviceDefPtr def,
+                               unsigned int *ap_adapter)
+{
+    g_autofree char *adapter = NULL;
+
+    if (!(adapter = virXPathString("string(./ap-adapter[1])", ctxt))) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("missing ap-adapter value for '%s'"), def->name);
+        return -1;
+    }
+
+    if (virStrToLong_uip(adapter, NULL, 0, ap_adapter) < 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("invalid ap-adapter value '%s' for '%s'"),
+                       adapter, def->name);
+        return -1;
+    }
+
+    return 0;
+}
+
+
+static int
+virNodeDevCapAPCardParseXML(xmlXPathContextPtr ctxt,
+                            virNodeDeviceDefPtr def,
+                            xmlNodePtr node,
+                            virNodeDevCapAPCardPtr ap_card)
+{
+    VIR_XPATH_NODE_AUTORESTORE(ctxt)
+    ctxt->node = node;
+
+    return virNodeDevCapAPAdapterParseXML(ctxt, def, &ap_card->ap_adapter);
+}
+
+
 static int
 virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt,
                              virNodeDeviceDefPtr def,
@@ -1979,6 +2021,10 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
     case VIR_NODE_DEV_CAP_CSS_DEV:
         ret = virNodeDevCapCCWParseXML(ctxt, def, node, &caps->data.ccw_dev);
         break;
+    case VIR_NODE_DEV_CAP_AP_CARD:
+        ret = virNodeDevCapAPCardParseXML(ctxt, def, node,
+                                          &caps->data.ap_card);
+        break;
     case VIR_NODE_DEV_CAP_MDEV_TYPES:
     case VIR_NODE_DEV_CAP_FC_HOST:
     case VIR_NODE_DEV_CAP_VPORTS:
@@ -2306,6 +2352,7 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
     case VIR_NODE_DEV_CAP_VPORTS:
     case VIR_NODE_DEV_CAP_CCW_DEV:
     case VIR_NODE_DEV_CAP_VDPA:
+    case VIR_NODE_DEV_CAP_AP_CARD:
     case VIR_NODE_DEV_CAP_LAST:
         /* This case is here to shutup the compiler */
         break;
@@ -2365,6 +2412,7 @@ virNodeDeviceUpdateCaps(virNodeDeviceDefPtr def)
         case VIR_NODE_DEV_CAP_MDEV:
         case VIR_NODE_DEV_CAP_CCW_DEV:
         case VIR_NODE_DEV_CAP_VDPA:
+        case VIR_NODE_DEV_CAP_AP_CARD:
         case VIR_NODE_DEV_CAP_LAST:
             break;
         }

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 262524fc87b741b7f84afb0119831ac3ff9c604f..f86f880c404a6633d826994a1b532ad595301d5b 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -66,6 +66,7 @@ typedef enum {
     VIR_NODE_DEV_CAP_CCW_DEV,           /* s390 CCW device */
     VIR_NODE_DEV_CAP_CSS_DEV,           /* s390 channel subsystem device */
     VIR_NODE_DEV_CAP_VDPA,              /* vDPA device */
+    VIR_NODE_DEV_CAP_AP_CARD,           /* s390 AP Card device */
 
     VIR_NODE_DEV_CAP_LAST
 } virNodeDevCapType;
@@ -289,6 +290,12 @@ struct _virNodeDevCapVDPA {
     char *chardev;
 };
 
+typedef struct _virNodeDevCapAPCard virNodeDevCapAPCard;
+typedef virNodeDevCapAPCard *virNodeDevCapAPCardPtr;
+struct _virNodeDevCapAPCard {
+    unsigned int ap_adapter;
+};
+
 typedef struct _virNodeDevCapData virNodeDevCapData;
 typedef virNodeDevCapData *virNodeDevCapDataPtr;
 struct _virNodeDevCapData {
@@ -308,6 +315,7 @@ struct _virNodeDevCapData {
         virNodeDevCapMdev mdev;
         virNodeDevCapCCW ccw_dev;
         virNodeDevCapVDPA vdpa;
+        virNodeDevCapAPCard ap_card;
     };
 };
 

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 9e46d22a2f83f8b4f2bb041f9603faf4cfacfac4..0aa59289811eea3cb8fa73b19368c3195c2f9aaa 100644 (file)
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -717,6 +717,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
         case VIR_NODE_DEV_CAP_MDEV:
         case VIR_NODE_DEV_CAP_CCW_DEV:
         case VIR_NODE_DEV_CAP_VDPA:
+        case VIR_NODE_DEV_CAP_AP_CARD:
         case VIR_NODE_DEV_CAP_LAST:
             break;
         }

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 17051fd01332f8f93de70403a4ea20ba2e3e62f3..deee85329cf6b9719cb7ec3fdbff8e9ae2ac5f0b 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1183,6 +1183,31 @@ udevProcessVDPA(struct udev_device *device,
 }
 
 
+static int
+udevProcessAPCard(struct udev_device *device,
+                  virNodeDeviceDefPtr def)
+{
+    char *c;
+    virNodeDevCapDataPtr data = &def->caps->data;
+
+    /* The sysfs path would be in the format /sys/bus/ap/devices/cardXX,
+       where XX is the ap adapter id */
+    if ((c = strrchr(def->sysfs_path, '/')) == NULL ||
+        virStrToLong_ui(c + 1 + strlen("card"), NULL, 16,
+                        &data->ap_card.ap_adapter) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("failed to parse the AP Card from sysfs path: '%s'"),
+                       def->sysfs_path);
+        return -1;
+    }
+
+    if (udevGenerateDeviceName(device, def, NULL) != 0)
+        return -1;
+
+    return 0;
+}
+
+
 static int
 udevGetDeviceNodes(struct udev_device *device,
                    virNodeDeviceDefPtr def)
@@ -1237,6 +1262,8 @@ udevGetDeviceType(struct udev_device *device,
             *type = VIR_NODE_DEV_CAP_NET;
         else if (STREQ(devtype, "drm_minor"))
             *type = VIR_NODE_DEV_CAP_DRM;
+        else if (STREQ(devtype, "ap_card"))
+            *type = VIR_NODE_DEV_CAP_AP_CARD;
     } else {
         /* PCI devices don't set the DEVTYPE property. */
         if (udevHasDeviceProperty(device, "PCI_CLASS"))
@@ -1312,6 +1339,8 @@ udevGetDeviceDetails(struct udev_device *device,
         return udevProcessCSS(device, def);
     case VIR_NODE_DEV_CAP_VDPA:
         return udevProcessVDPA(device, def);
+    case VIR_NODE_DEV_CAP_AP_CARD:
+        return udevProcessAPCard(device, def);
     case VIR_NODE_DEV_CAP_MDEV_TYPES:
     case VIR_NODE_DEV_CAP_SYSTEM:
     case VIR_NODE_DEV_CAP_FC_HOST:

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 527bf49fc3a35a9b150c83c3778365cae0854a25..32c12553a9009bdb56b4dbc60a6024d5228cf913 100644 (file)
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -467,6 +467,7 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED)
         case VIR_NODE_DEV_CAP_VDPA:
             flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_VDPA;
             break;
+        case VIR_NODE_DEV_CAP_AP_CARD:
         case VIR_NODE_DEV_CAP_LAST:
             break;
         }