Commit bf328399 authored by Yi Min Zhao's avatar Yi Min Zhao Committed by Cornelia Huck
Browse files

s390x/pci: enable uid-checking 



The uid-checking facility guarantees uniqueness of the uid within the
vm and exposes the real uid to the guest when listing pci devices.
Let's always enable it and present it to the guest in the response to
the list pci clp command.

Signed-off-by: default avatarYi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 3e5cfba3

hw/s390x/s390-pci-bus.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define ZPCI_MAX_FID 0xffffffff

#define ZPCI_MAX_UID 0xffff

#define UID_UNDEFINED 0

#define UID_CHECKING_ENABLED 0x01



#define S390_PCI_HOST_BRIDGE(obj) \

    OBJECT_CHECK(S390pciState, (obj), TYPE_S390_PCI_HOST_BRIDGE)

hw/s390x/s390-pci-inst.c

+3 −4
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ static int list_pci(ClpReqRspListPci *rrb, uint8_t *cc) 
    }



    if ((ldl_p(&rrb->request.fmt) & ~CLP_MASK_FMT) != 0 ||

        ldq_p(&rrb->request.reserved1) != 0 ||

        ldq_p(&rrb->request.reserved2) != 0) {

        ldq_p(&rrb->request.reserved1) != 0) {

        res_code = CLP_RC_RESNOT0;

        rc = -EINVAL;

        goto out;
@@ -91,9 +90,9 @@ static int list_pci(ClpReqRspListPci *rrb, uint8_t *cc) 


    stl_p(&rrb->response.fmt, 0);

    stq_p(&rrb->response.reserved1, 0);

    stq_p(&rrb->response.reserved2, 0);

    stl_p(&rrb->response.mdd, FH_MASK_SHM);

    stw_p(&rrb->response.max_fn, PCI_MAX_FUNCTIONS);

    rrb->response.flags = UID_CHECKING_ENABLED;

    rrb->response.entry_size = sizeof(ClpFhListEntry);

    finish = 0;

    idx = resume_token;
@@ -260,7 +259,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2) 
        stl_p(&resquery->fid, pbdev->fid);

        stw_p(&resquery->pchid, 0);

        stw_p(&resquery->ug, 1);

        stl_p(&resquery->uid, pbdev->fid);

        stl_p(&resquery->uid, pbdev->uid);

        stw_p(&resquery->hdr.rsp, CLP_RC_OK);

        break;

    }

hw/s390x/s390-pci-inst.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ typedef struct ClpRspListPci { 
    uint64_t resume_token;

    uint32_t mdd;

    uint16_t max_fn;

    uint8_t reserved2;

    uint8_t flags;

    uint8_t entry_size;

    ClpFhListEntry fh_list[CLP_FH_LIST_NR_ENTRIES];

} QEMU_PACKED ClpRspListPci;